OSDN Git Service
Jakub Pawlowski [Thu, 17 Aug 2017 14:19:12 +0000 (07:19 -0700)]
Bluetooth: Fix startAdvertisingSet error handling
Calls to old advertising API (startAdvertising), should never throw
exceptions. Instead, it used to post failure callback. This behaviour
was accidentally modified when implementing new API. Right now, instead
of posting error callback, we throw IllegalArgumentException if we fail
to obtain BluetoothGatt object, or the call to startAdvertisingSet
fails.
This patch brings back the old behaviour to the API. It also makes new
API post callback instead of throwing exception in this error case.
Bug:
63819108
Test: manual
Change-Id: I897b99839f899ca3f3dc609918d665c8c327b777
Merged-In: I897b99839f899ca3f3dc609918d665c8c327b777
(cherry picked from commit
f7bd6b26c73b7ea0bbfd00b75c23895eca281aff)
Hugo Benichi [Thu, 17 Aug 2017 22:31:59 +0000 (22:31 +0000)]
Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 22:21:28 +0000 (22:21 +0000)]
Merge "Wifi connection hysteresis" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 18:38:04 +0000 (18:38 +0000)]
Merge "Don't call surface.remove if surface is null." into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 18:28:57 +0000 (18:28 +0000)]
Merge "AOD: Delay removing AOD scrim after pulse" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 18:04:40 +0000 (18:04 +0000)]
Merge "Reduced the retry after disconnect delay" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 18:00:03 +0000 (18:00 +0000)]
Merge "Hide subtitle for dialog from QS when applicable" into oc-mr1-dev
Sudheer Shanka [Thu, 17 Aug 2017 17:12:05 +0000 (17:12 +0000)]
Merge "Update standby firewall rules when an app came out of standby mode." into oc-mr1-dev
Bryce Lee [Thu, 17 Aug 2017 17:11:52 +0000 (17:11 +0000)]
Merge "Add back support for force resize developer option." into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 17:09:13 +0000 (17:09 +0000)]
Merge "Make default brightness ramp rates multiples of 60." into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 17:08:33 +0000 (17:08 +0000)]
Merge "Small fix to pm dumpsys formatting." into oc-mr1-dev
Hall Liu [Thu, 17 Aug 2017 16:17:53 +0000 (16:17 +0000)]
Merge "Do not throw IOException from RttCall.read()" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 16:02:54 +0000 (16:02 +0000)]
Merge "Fixed NPE when cancellation signal is null." into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 15:54:52 +0000 (15:54 +0000)]
Merge changes I36636687,I4c45f787 into oc-mr1-dev
* changes:
Doc updates
Translate default channel on locale change
Daniel Sandler [Thu, 17 Aug 2017 14:32:40 +0000 (14:32 +0000)]
Merge changes from topic "revert-injectors" into oc-mr1-dev
* changes:
Revert "Add API to allow apps more control over instantiation"
Revert "Add plugin to swap out recents"
Adrian Roos [Thu, 17 Aug 2017 14:10:31 +0000 (16:10 +0200)]
AOD: Delay removing AOD scrim after pulse
Fixes an issue where pulse scrim was lifted before the power state got applied
to the display, resulting in a flicker.
Change-Id: Id06a24414af724db616292a50210b5f55345079b
Fixes:
64077859
Test: Receive notification on AOD, swipe away, verify no flicker.
TreeHugger Robot [Thu, 17 Aug 2017 09:06:57 +0000 (09:06 +0000)]
Merge "Tell the system when tethering offload hits a limit." into oc-mr1-dev
Charles He [Thu, 17 Aug 2017 07:54:05 +0000 (07:54 +0000)]
Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev
Lorenzo Colitti [Tue, 15 Aug 2017 10:25:51 +0000 (19:25 +0900)]
Tell the system when tethering offload hits a limit.
Add a new tetherLimitReached method to INetworkManagementService,
and call it when the HAL notifies OffloadController because the
limit has been reached.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I0304e555544ee18c83244672766c767cbad650a1
Dianne Hackborn [Thu, 17 Aug 2017 05:58:47 +0000 (05:58 +0000)]
Maps crashed entering PIP right after...
am:
598c497be3 -s ours
Change-Id: Id0998230a13bd257c54b078e9d4ba42943a42db0
Dianne Hackborn [Mon, 31 Jul 2017 20:56:02 +0000 (13:56 -0700)]
Maps crashed entering PIP right after...
...beginning navigation
Bug:
64140901
Test: booted and ran and posted notifications.
Merged-In:I8c9173dab2716b901cc6dd66f0b0d18cae33f298
Change-Id: I8c9173dab2716b901cc6dd66f0b0d18cae33f298
(cherry picked from commit
52195a66311d79a2f57e8112db86d48ed15bf915)
Sudheer Shanka [Thu, 17 Aug 2017 04:49:04 +0000 (04:49 +0000)]
Merge "Fix and enable ConnOnActivityStartTest." into oc-mr1-dev
Vineeta Srivastava [Thu, 17 Aug 2017 03:15:32 +0000 (03:15 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev
am:
c6349f3943
Change-Id: I85a0971fe3c33f533a1758e8b604b7b1ade2b470
Vineeta Srivastava [Thu, 17 Aug 2017 03:07:47 +0000 (03:07 +0000)]
Merge "Add new "fast" filter for ambient light." into oc-dr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 03:07:02 +0000 (03:07 +0000)]
Merge "Revert "Dismiss Autofill Save UI when a new Activity is launched."" into oc-mr1-dev
Jeff Davidson [Thu, 17 Aug 2017 02:53:43 +0000 (02:53 +0000)]
Merge "Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public." into oc-mr1-dev
Svetoslav Ganov [Thu, 17 Aug 2017 02:44:01 +0000 (02:44 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev am:
357f42bf69
am:
2800f22eec -s ours
Change-Id: I767ece0ec5b60ef92da2e6ebe394bdcf2e966328
Svetoslav Ganov [Thu, 17 Aug 2017 02:34:36 +0000 (02:34 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev
am:
357f42bf69
Change-Id: I42b5eabd1e21aa5b7c5ab71b34d5eadada0023aa
TreeHugger Robot [Thu, 17 Aug 2017 02:29:21 +0000 (02:29 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-dev
Svetoslav Ganov [Wed, 16 Aug 2017 21:50:00 +0000 (14:50 -0700)]
Properly compute default and system set flag on an upgrade
We added the notions of a default value and whether this default is set
by the system for a setting which is needed for experiments since in
case a bad value is pushed we should be able to incrementally rollback
to a stable state. If a system component sets a setting value this
automatically becomes the default. System components are the platform
package, the special UIDs (telephony, etc), apps singed with the
platform cert, system installed persistent apps, and SUW.
In N we did not have the notion of a default and during an upgrade need
to adjust the default and whether this default is set by the system.
This migration runs as the system UID and was incorrectly computing that
the package that changed the settings last was a part of the system and
setting the current value as its default set by the system. This
resulted in taking more storage space as we also count the default which
led the package which changed the setting to go over the quota and that
throws. If the first caller into the settings provider is the system
main
thread (almost certain) we end up throwing an exception on the system
main thread - crashing the system server.
Test: flash N, install an app abusing sys settings, update to O
Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e
bug:
64718888
Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
Sudheer Shanka [Sat, 12 Aug 2017 01:22:16 +0000 (18:22 -0700)]
Fix and enable ConnOnActivityStartTest.
- Set parole duration to 0 so that it won't affect app standby test.
- Use a bound service to send commands to test app instead of broadcasts.
- Remove code to install/delete test app as it will be done as part of tests
initialization.
Bug:
38432755
Test: forrest --extra_args='--class com.android.server.net.ConnOnActivityStartTest' \
test FrameworksServicesTests
Change-Id: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
Merged-In: Ic6cd574a60c4449195f2c8cd4e04b9cb47f225c8
Hugo Benichi [Tue, 8 Aug 2017 04:06:04 +0000 (13:06 +0900)]
Add convenience methods to IpPrefix and LinkAddress
Also moving relevant test files into tests/net as part of runtest
framworks-net.
Also removes testHashCode in LinkAddress() because this test relies on
the assumption that hashCode() is stable across releases or jdk
versions, which is absolutely not true.
This creates maintenance work for little benefit since hashCode is
already tested as part of the equality test.
For instance this test is now broken because hashing for InetAddress
changed.
Bug:
62988545
Bug:
62918393
Test: runtest frameworks-net, added coverage in tests
Merged-In: I695bc3f0e801bf13bc4fc0706565758f12b775b4
Merged-In: I6d3f3c50eaec44e3a0787e849ab28e89f6f4a72d
Merged-In: Iddfec82a08f845e728adadfa6ec58a60a078d6af
Merged-In: I8d6dd5efd226a8b1c4b05d1e1102362b58e094a1
Merged-In: Ied0cc53ac34c7c5f5539507b1979cbf9c215262e
Merged-In: I3b2b7dcb1a9a194fc08643b27bbb5a0e84e01412
(cherry picked from commit
1dfb6b67555d04973dfb9d1100dfc1c6a5200633)
Change-Id: I9a17094bfdc54b9dec671306618e132a4beb59fc
TreeHugger Robot [Thu, 17 Aug 2017 01:52:01 +0000 (01:52 +0000)]
Merge "Add Persian keyboard layout to default layouts" into oc-mr1-dev
Android Build Merger (Role) [Thu, 17 Aug 2017 01:27:30 +0000 (01:27 +0000)]
Merge "Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am:
1c414bf30b -s ours" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 01:27:06 +0000 (01:27 +0000)]
Merge "Reducing the image sizes further for low-ram devices" into oc-mr1-dev
Justin Klaassen [Thu, 17 Aug 2017 01:22:49 +0000 (01:22 +0000)]
Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
am:
1c414bf30b -s ours
Change-Id: Ia3cabe5460e2f9f2a532e9f038f80909e8176d9b
Michael Wright [Wed, 16 Aug 2017 19:38:21 +0000 (20:38 +0100)]
Add new "fast" filter for ambient light.
The slow filter wasn't converging fast enough when we shortened the
debounce timings but we still want it to ensure there's a long term
change happening, so add a new filter that converges much faster. This
new fast filter is just a weighted sliding window just like the slow
filter, but it has a significantly smaller horizon.
Bug:
64514692
Test: manual
Change-Id: I1e990ac1e6a56268fa42a85399a2d41cc8dd2104
TreeHugger Robot [Thu, 17 Aug 2017 01:10:16 +0000 (01:10 +0000)]
Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
Felipe Leme [Wed, 16 Aug 2017 19:29:53 +0000 (12:29 -0700)]
Fixed NPE when cancellation signal is null.
Test: none for this particular issue, but CtsAutoFillServiceTestCases pass
Fixes:
64759228
Change-Id: I34170440ac388ec6ba7ed5632dc38543a84d0327
Julia Reynolds [Thu, 17 Aug 2017 00:54:22 +0000 (00:54 +0000)]
Merge "Optionally append managed service approvals" into oc-dr1-dev
am:
445a6d42ef -s ours
Change-Id: I8f4d84a128cbdca8e4a9c9e330765b324569bd1c
TreeHugger Robot [Thu, 17 Aug 2017 00:31:42 +0000 (00:31 +0000)]
Merge "Optionally append managed service approvals" into oc-dr1-dev
Siarhei Vishniakou [Thu, 17 Aug 2017 00:30:28 +0000 (00:30 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours am:
3455f8f527
am:
8d272b9dd5
Change-Id: I17ee75a8177368c8bbe7d8bc82138c0edd5b9c02
Siarhei Vishniakou [Thu, 17 Aug 2017 00:14:48 +0000 (00:14 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee am:
1ca8da1969 -s ours
am:
3455f8f527
Change-Id: Id27376f6e99bb52527e6f02af9a2a654bdc1f5b0
Dianne Hackborn [Tue, 15 Aug 2017 21:10:39 +0000 (14:10 -0700)]
Small fix to pm dumpsys formatting.
Get rid of a spurious newline.
Test: builds and runs and prints.
Bug:
64770628
Change-Id: I2b7657ada5e8eb0a2ef90b1bc2e1027493c808a3
Philip P. Moltmann [Wed, 16 Aug 2017 23:49:21 +0000 (23:49 +0000)]
Merge "Don't get struct of children of !laidout viewGroup" into oc-mr1-dev
Siarhei Vishniakou [Wed, 16 Aug 2017 23:47:50 +0000 (23:47 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8 am:
a5ba83e2ee
am:
1ca8da1969 -s ours
Change-Id: I7db93785a58b059d17725188d42adfd4c7b7780a
Felipe Leme [Wed, 16 Aug 2017 23:25:07 +0000 (23:25 +0000)]
Revert "Dismiss Autofill Save UI when a new Activity is launched."
This reverts commit
05ea98a3f95a2f5179c01a5bfd4901835a0c1bd8.
Bug:
64693551
Change-Id: I8e7a7b2c5f575cee28f977ae7f3c10752a15d49c
Jeff Davidson [Wed, 16 Aug 2017 17:40:00 +0000 (10:40 -0700)]
Make KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL public.
There is a reasonable use case for carrier apps to turn off this key
(b/
64544341) so it should be visible to apps in the SDK.
Change-Id: I1a06196d4d4c7d6d06026ef74f3f1159c973f8e3
Test: TreeHugger
Fixes:
64721199
Siarhei Vishniakou [Wed, 16 Aug 2017 23:30:28 +0000 (23:30 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2 am:
3674e3d9d8
am:
a5ba83e2ee
Change-Id: I442dc3021f89fe808159ce8787e4d2950a4d0806
David Stevens [Wed, 16 Aug 2017 23:15:05 +0000 (23:15 +0000)]
Merge "DO NOT MERGE Let external activities run when the primary display is off" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 23:14:47 +0000 (23:14 +0000)]
Merge "Log SystemServerShutdown earlier" into oc-mr1-dev
Siarhei Vishniakou [Wed, 16 Aug 2017 23:09:40 +0000 (23:09 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99 am:
a5e996c2e2
am:
3674e3d9d8
Change-Id: I9bc6659634cd92ceadc9b0560f2802b90b24d573
TreeHugger Robot [Wed, 16 Aug 2017 23:04:22 +0000 (23:04 +0000)]
Merge "Enable tasksnap shots on low ram devices" into oc-mr1-dev
Qingxi Li [Wed, 16 Aug 2017 23:03:48 +0000 (23:03 +0000)]
Merge "Add an extra for intent ACTION_PROVISION_EMBEDDED_SUBSCRIPTION" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 22:55:52 +0000 (22:55 +0000)]
Merge "API Council feedback" into oc-mr1-dev
Siarhei Vishniakou [Wed, 16 Aug 2017 22:55:31 +0000 (22:55 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours am:
712baa6c99
am:
a5e996c2e2
Change-Id: Idfdd87bbf432a23d73a544810bbda29126f15c6d
Justin Klaassen [Wed, 16 Aug 2017 22:37:08 +0000 (15:37 -0700)]
DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings
There is an issue in the translation pipeline so these strings have
been updated manually to match the English version.
Fixes:
63899732
Test: Verified strings in non-English locales.
Change-Id: I9db3417fc58370990566053976b0995b00127e56
TreeHugger Robot [Wed, 16 Aug 2017 22:49:49 +0000 (22:49 +0000)]
Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev
Siarhei Vishniakou [Wed, 16 Aug 2017 22:39:46 +0000 (22:39 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9 am:
b007784ed1 -s ours
am:
712baa6c99
Change-Id: Ic2c5a354d8ee69609a6152d75ccdbe66fb8e3daa
Lucas Dupin [Wed, 16 Aug 2017 22:30:04 +0000 (22:30 +0000)]
Merge "Fix null pointer when mColorFadeEnabled is false" into oc-mr1-dev
Siarhei Vishniakou [Wed, 16 Aug 2017 22:19:11 +0000 (22:19 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02 am:
a23674b4f9
am:
b007784ed1 -s ours
Change-Id: I152a8ebaf97c37be52de29c0639fa221a28b5fce
TreeHugger Robot [Wed, 16 Aug 2017 22:11:12 +0000 (22:11 +0000)]
Merge changes I768830f5,I665bde3a into oc-mr1-dev
* changes:
Removed redundant [X] icon used to close Autofill Save UI.
Re-added outer layout on Autofill Save UI that was accidentally removed.
TreeHugger Robot [Wed, 16 Aug 2017 22:10:46 +0000 (22:10 +0000)]
Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev
Siarhei Vishniakou [Wed, 16 Aug 2017 21:56:58 +0000 (21:56 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7 am:
e8b48abb02
am:
a23674b4f9
Change-Id: I1071a79ff62a800027c5da1ffad9401e83f541b1
Siarhei Vishniakou [Wed, 16 Aug 2017 21:39:41 +0000 (21:39 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours am:
6a7c6a24a7
am:
e8b48abb02
Change-Id: I171e3e1d9575f4e9b61ee46cfc08ac4331d6d245
Michael Wright [Wed, 16 Aug 2017 21:35:09 +0000 (22:35 +0100)]
Make default brightness ramp rates multiples of 60.
If ramp rates aren't even multiple of 60 then we're more likely to get
brightness changes that differ each frame, which can show up as a
stuttering in the animation.
Bug:
64514692
Test: made change, took systrace, saw smooth ramping
Change-Id: Iada2f1de684d94fe790ab8d5cf03bea5ba1a2ca5
Jack Yu [Wed, 16 Aug 2017 21:26:56 +0000 (14:26 -0700)]
Reduced the retry after disconnect delay
Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.
Test: Manual
bug:
63633916
Change-Id: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Siarhei Vishniakou [Wed, 16 Aug 2017 21:26:49 +0000 (21:26 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553 am:
3d1931d4e3 -s ours
am:
6a7c6a24a7
Change-Id: I72398c99878637d26dbb976bab05aca315368729
Siarhei Vishniakou [Wed, 16 Aug 2017 21:15:05 +0000 (21:15 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours am:
b737365553
am:
3d1931d4e3 -s ours
Change-Id: Ieb19904cf060072d2525836ebba9f310da515b4b
Mathieu Chartier [Wed, 16 Aug 2017 21:08:22 +0000 (21:08 +0000)]
Merge "Add CollationRoot to preloaded classes" into oc-mr1-dev
Qingxi Li [Wed, 16 Aug 2017 21:07:04 +0000 (21:07 +0000)]
Merge "Fix problems of SIM lock screen of eSIM" into oc-mr1-dev
Bill Yi [Wed, 16 Aug 2017 21:02:20 +0000 (21:02 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into oc-dr1-dev
am:
2dc7e093b4 -s ours
Change-Id: I0dfea4c7aafd2b62aa5f57a643c952ef89b2f2e9
Julia Reynolds [Tue, 15 Aug 2017 18:43:00 +0000 (14:43 -0400)]
Optionally append managed service approvals
If the backup comes from a pre O device, don't wipe
preexisting managed service grants (which were introduced in O).
Merged-In: I142df7acb11309bc4f5f185e45a1f91f86d0334a
Merged-In: Ie569972dc0d076718a3a9c59e1ebd942c5bfa987
Test: manual, restore from N to O DR
Bug:
64232609
Change-Id: Ieec2c821d9a088c69a5bc143acf8537ba300202d
Mathieu Chartier [Wed, 16 Aug 2017 18:37:02 +0000 (11:37 -0700)]
Add CollationRoot to preloaded classes
It was determined this would save RAM.
Test: ./generate-preloaded-classes.sh base.txt preloaded-classes-blacklist preloaded-classes-extra > preloaded-classes
Test: Look at the generated file
Bug:
63444758
Change-Id: Ib49b1218e94e4a4a2211071da189cf917559248b
Siarhei Vishniakou [Wed, 16 Aug 2017 20:50:20 +0000 (20:50 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours am:
3280efe50e -s ours
am:
b737365553
Change-Id: I375324a937478c584e95cb6550d98293162656fc
Charles He [Wed, 16 Aug 2017 20:48:52 +0000 (20:48 +0000)]
Merge "Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d am:
69ae08b680 am:
35c3b58d46 am:
c29ad5c94c" into oc-dr1-dev
am:
51654d921f
Change-Id: Ic7abb0e6bc5d75e26de8898e4c1a880e17c8da8f
Bill Yi [Wed, 16 Aug 2017 20:42:31 +0000 (20:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
fd457b1220 -s ours
Change-Id: Ia15a920f9a1af9e11d12a7fdd87845c2d27d72d2
Bill Yi [Wed, 16 Aug 2017 20:39:30 +0000 (20:39 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into oc-dr1-dev
Bill Yi [Wed, 16 Aug 2017 20:37:47 +0000 (20:37 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
0a2337f7473cbaca630d48b19d923516fd3c131d.
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
63899732
Change-Id: Ib5c23d395c3681d8d679f02758bbc6337f681ce8
Siarhei Vishniakou [Wed, 16 Aug 2017 20:35:40 +0000 (20:35 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6 am:
9d99b0001e -s ours
am:
3280efe50e -s ours
Change-Id: Ia7bf4d6991be15c732ba8b55c37f2c9e447b1dbd
Android Build Merger (Role) [Wed, 16 Aug 2017 20:33:32 +0000 (20:33 +0000)]
Merge "Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d am:
69ae08b680 am:
35c3b58d46 am:
c29ad5c94c" into oc-dr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 20:32:55 +0000 (20:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Charles He [Wed, 16 Aug 2017 20:29:58 +0000 (20:29 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d am:
69ae08b680 am:
35c3b58d46
am:
c29ad5c94c
Change-Id: Ie4453acd727f8f581c1224ee0f288e3150b97446
Siarhei Vishniakou [Wed, 16 Aug 2017 20:19:29 +0000 (20:19 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff am:
96fe6421f6
am:
9d99b0001e -s ours
Change-Id: Ib0fb40f990138b3729b66bdb6d6a095bd3ad231d
Charles He [Wed, 16 Aug 2017 20:15:23 +0000 (20:15 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d am:
69ae08b680
am:
35c3b58d46
Change-Id: I9ce7456fec5af181ec5e42bfc5f139a1b00137cf
Bryan Eyler [Wed, 16 Aug 2017 20:09:08 +0000 (20:09 +0000)]
Merge "Add the margin between user pods." into oc-mr1-dev
Bryan Eyler [Wed, 2 Aug 2017 00:40:16 +0000 (17:40 -0700)]
Add the margin between user pods.
In fullscreen user switcher, there is a margin that needs to be
accounted for between user pods. This is not the same as the margin
that increases the size of a user pod.
Also fixes the way the layout is done so that it handles long user
names properly with ellipsis.
Bug:
36454400
Tested on Mojave
Change-Id: Idb3468f6a8c3f1b81a96c5ff73ff1d32c48e2c82
Siarhei Vishniakou [Wed, 16 Aug 2017 20:03:29 +0000 (20:03 +0000)]
DO NOT MERGE Remove window obscurement information. am:
c3c2ed94ff
am:
96fe6421f6
Change-Id: Ia2ce3f8b95b578253c5336407ae85880d3d317f4
Charles He [Wed, 16 Aug 2017 20:03:15 +0000 (20:03 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d
am:
69ae08b680
Change-Id: Ida122a46fece975924a002e6a5a0f6521ed8756f
Makoto Onuki [Wed, 16 Aug 2017 19:57:36 +0000 (19:57 +0000)]
Merge "Fix sync back-off" into oc-dr1-dev
am:
9fd497cdae
Change-Id: I029aaf190316aa0e7924fda472fdcf718050f4d4
Charles He [Wed, 16 Aug 2017 19:51:43 +0000 (19:51 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662
am:
510f02244d
Change-Id: I3bfe22ab41813abbeebee58d7cc8789e95a1a2fa
Siarhei Vishniakou [Wed, 16 Aug 2017 19:48:22 +0000 (19:48 +0000)]
DO NOT MERGE Remove window obscurement information.
am:
c3c2ed94ff
Change-Id: Ib9552165e9b1c2dfcd235d1f7930d85c258b2ece
TreeHugger Robot [Wed, 16 Aug 2017 19:41:53 +0000 (19:41 +0000)]
Merge "Fix sync back-off" into oc-dr1-dev
Seigo Nonaka [Wed, 16 Aug 2017 19:39:49 +0000 (12:39 -0700)]
Don't call surface.remove if surface is null.
This essentially revives the null check removed in
I55e2c1b8fba32b3a19603e6ad4743f07576abd48
Test: N/A
Bug:
64722384
Change-Id: Ifdbc29df54a1a5aedf0e31e0c461146a3e59917d
Charles He [Wed, 16 Aug 2017 19:39:50 +0000 (19:39 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c
am:
a175bae662
Change-Id: Id250bcbcf92bdb95813dc4fcdd772aeef7f29c0a
TreeHugger Robot [Wed, 16 Aug 2017 19:38:45 +0000 (19:38 +0000)]
Merge "Do not filter out some colors" into oc-mr1-dev
Charles He [Wed, 16 Aug 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1
am:
6adae5108c
Change-Id: I104eea9bf02f89b6c2bde0daeff81aaa781e323d
Kevin Hufnagle [Wed, 16 Aug 2017 19:16:10 +0000 (19:16 +0000)]
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am:
80376a98a5
am:
d6d6d2cf79
Change-Id: I63af60b006618bdd8bb74d351f9c17432f411b63
Charles He [Wed, 16 Aug 2017 19:13:17 +0000 (19:13 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70
am:
733c7607d1
Change-Id: Id1c4c4de5d6e4da05188326287ae86e74bf89623
Kevin Hufnagle [Wed, 16 Aug 2017 19:01:36 +0000 (19:01 +0000)]
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
am:
80376a98a5
Change-Id: Iae8814e722f7861ecd96980d16c06a676c6ad1dc
OSDN Git Service
