OSDN Git Service
Yangster-mac [Thu, 10 May 2018 01:15:58 +0000 (18:15 -0700)]
Merge "Fix the flaky gauge/value e2e test due to cached events." into pi-dev
am:
a159842161
Change-Id: I3942b5c691b31054ca63b3bbd7fc89ec269c9e28
TreeHugger Robot [Thu, 10 May 2018 01:02:10 +0000 (01:02 +0000)]
Merge "Fix the flaky gauge/value e2e test due to cached events." into pi-dev
Mehdi Alizadeh [Thu, 10 May 2018 00:50:32 +0000 (17:50 -0700)]
Merge "Adds overlay field for Swipe Up gesture's default opt-in value" into pi-dev
am:
cac60f9290
Change-Id: Iadf5d33cc291ece36614b336bb1794162fd7808c
Calin Juravle [Thu, 10 May 2018 00:45:18 +0000 (17:45 -0700)]
Merge "Properly prepare system server profiles" am:
15b9558018
am:
35fe028c93
Change-Id: Ie6a6db38365443db2c4a0ab8d8303f77b7ea2e0b
Mehdi Alizadeh [Thu, 10 May 2018 00:38:50 +0000 (00:38 +0000)]
Merge "Adds overlay field for Swipe Up gesture's default opt-in value" into pi-dev
Calin Juravle [Thu, 10 May 2018 00:37:42 +0000 (17:37 -0700)]
Merge "Properly prepare system server profiles"
am:
15b9558018
Change-Id: I83070dd881f164e8d458925274b2fb41851b1ae5
Felipe Leme [Thu, 10 May 2018 00:07:55 +0000 (17:07 -0700)]
Merge "Fixed name of autofill service on save UI." into pi-dev
am:
d42963276b
Change-Id: I4fdcc9d4474f77c0b7bd31c2f437675730a9e65f
Felipe Leme [Wed, 9 May 2018 23:48:50 +0000 (23:48 +0000)]
Merge "Fixed name of autofill service on save UI." into pi-dev
Calin Juravle [Wed, 9 May 2018 23:34:54 +0000 (16:34 -0700)]
Merge "Make system server profiling an explicit runtime intent" am:
232011c7d9
am:
a50afa5ebf
Change-Id: I163a9815f5001bbd5963dd0575b9fd2125169b38
Calin Juravle [Wed, 9 May 2018 23:25:53 +0000 (16:25 -0700)]
Merge "Make system server profiling an explicit runtime intent"
am:
232011c7d9
Change-Id: I07e6b4f0e75ff96bda3d5ce5acf6b9ea1f999325
fionaxu [Wed, 9 May 2018 23:08:26 +0000 (16:08 -0700)]
Merge "add install action for carrier id to system API" into pi-dev
am:
689866352b
Change-Id: I472e17218bfe5bcb3178ff6da87910812b17a4dc
Leon Scroggins [Wed, 9 May 2018 22:59:50 +0000 (15:59 -0700)]
Merge "Allow ImageDecoder to read SkFILEStream directly" into pi-dev
am:
b9790fd184
Change-Id: I1f9a56d8e4bcfe2b992faeb529704ba53f825b08
TreeHugger Robot [Wed, 9 May 2018 22:47:40 +0000 (22:47 +0000)]
Merge "add install action for carrier id to system API" into pi-dev
Leon Scroggins [Wed, 9 May 2018 22:44:39 +0000 (22:44 +0000)]
Merge "Allow ImageDecoder to read SkFILEStream directly" into pi-dev
Siarhei Vishniakou [Wed, 9 May 2018 22:22:49 +0000 (15:22 -0700)]
Merge "Add full unlock gesture to FalsingManager" into pi-dev
am:
2ea09f069d
Change-Id: Id8149b2f4a4ae12fa24b30ed50c595e23994a6f7
Calin Juravle [Wed, 9 May 2018 22:12:42 +0000 (22:12 +0000)]
Merge "Properly prepare system server profiles"
Calin Juravle [Wed, 9 May 2018 22:12:07 +0000 (22:12 +0000)]
Merge "Make system server profiling an explicit runtime intent"
TreeHugger Robot [Wed, 9 May 2018 22:09:20 +0000 (22:09 +0000)]
Merge "Add full unlock gesture to FalsingManager" into pi-dev
Suprabh Shukla [Wed, 9 May 2018 22:06:50 +0000 (15:06 -0700)]
Merge "Added unit test for activity start interceptor" into pi-dev
am:
0d66083f7c
Change-Id: I0b9e869557a6579dd614e84d4a789df7ffb58390
TreeHugger Robot [Wed, 9 May 2018 21:52:53 +0000 (21:52 +0000)]
Merge "Added unit test for activity start interceptor" into pi-dev
Tim Murray [Wed, 9 May 2018 21:44:43 +0000 (14:44 -0700)]
Merge "ActivityManagerService: explicitly break connection cycles" into pi-dev
am:
40ffa170ca
Change-Id: Ic471524a5f37d996759c2cc4f8fda5cfb91a46c8
Patrick Baumann [Wed, 9 May 2018 21:34:44 +0000 (14:34 -0700)]
Merge "Allows disk reads when adding native paths to classloader" into pi-dev
am:
147ef6b1a4
Change-Id: I8d7e6d5acfa18169ab34aa8014d706201fa00ea4
TreeHugger Robot [Wed, 9 May 2018 21:34:00 +0000 (21:34 +0000)]
Merge "ActivityManagerService: explicitly break connection cycles" into pi-dev
Philip P. Moltmann [Wed, 9 May 2018 21:28:27 +0000 (14:28 -0700)]
Merge "DO NOT MERGE: Allow to control behavior of loadSafeLabel" into pi-dev
am:
c8b3e0b617
Change-Id: I9ffcc86f9a6b040f289ca636955f33ec36d41ac6
TreeHugger Robot [Wed, 9 May 2018 21:19:53 +0000 (21:19 +0000)]
Merge "Allows disk reads when adding native paths to classloader" into pi-dev
TreeHugger Robot [Wed, 9 May 2018 21:17:51 +0000 (21:17 +0000)]
Merge "DO NOT MERGE: Allow to control behavior of loadSafeLabel" into pi-dev
Chia-I Wu [Wed, 9 May 2018 21:17:09 +0000 (14:17 -0700)]
Merge "Fix night light and COLOR_MODE_AUTOMATIC" into pi-dev
am:
088bfc8db9
Change-Id: Ib2b83f4f205e90097d81dd54b26be6d521ccbc0a
Chia-I Wu [Wed, 9 May 2018 21:04:08 +0000 (21:04 +0000)]
Merge "Fix night light and COLOR_MODE_AUTOMATIC" into pi-dev
Jiabin Huang [Wed, 9 May 2018 20:57:12 +0000 (13:57 -0700)]
Merge "Fix shutter sound cannot enable." into pi-dev
am:
065df1d75b
Change-Id: Ic6396b94e66ccbcb249cef61a319dba63846f091
Calin Juravle [Wed, 9 May 2018 20:48:25 +0000 (13:48 -0700)]
Merge "Add cmd package shell command for taking profile snapshots" into pi-dev
am:
855694e15b
Change-Id: I83434a174646a4ded61b00bff781ae113f008f1c
Jiabin Huang [Wed, 9 May 2018 20:43:14 +0000 (20:43 +0000)]
Merge "Fix shutter sound cannot enable." into pi-dev
Calin Juravle [Wed, 9 May 2018 20:39:25 +0000 (20:39 +0000)]
Merge "Add cmd package shell command for taking profile snapshots" into pi-dev
Calin Juravle [Wed, 9 May 2018 20:12:31 +0000 (13:12 -0700)]
Merge "Process "dalvik.vm.profilebootimage" system property" into pi-dev
am:
4c1d1c93df
Change-Id: I78617303a2f4d39273565cc72369b572d428a7f8
Pavel Grafov [Wed, 9 May 2018 20:07:14 +0000 (13:07 -0700)]
Merge "Log wipe failure" into pi-dev
am:
9cf46fd625
Change-Id: I2d653362b4f1ad0584a04644503b13a0bdb67c6e
Pavel Grafov [Wed, 9 May 2018 20:02:10 +0000 (13:02 -0700)]
Merge "Acquire lock before calling getDeviceOwnerAdminLocked" into pi-dev
am:
b9ab72bf96
Change-Id: Id969235011d5d836b0f79640e07a2c5035b66fd8
Calin Juravle [Wed, 9 May 2018 19:56:59 +0000 (19:56 +0000)]
Merge "Process "dalvik.vm.profilebootimage" system property" into pi-dev
Felipe Leme [Wed, 9 May 2018 19:42:53 +0000 (12:42 -0700)]
Fixed name of autofill service on save UI.
Test: atest CtsAutoFillServiceTestCases
Bug:
62537081
Fixes:
79201521
Change-Id: I9ae7137719390b61c38da1e52fcb13fd59333792
Philip P. Moltmann [Wed, 9 May 2018 16:13:24 +0000 (09:13 -0700)]
DO NOT MERGE: Allow to control behavior of loadSafeLabel
(Minimal change for P, full change already in master)
Test: looked at package installer UI and saw that labels are not
truncated anymore.
Bug:
77964730
Change-Id: Ia181288a90501f4f563d24dacd6edb0c81406b82
Pavel Grafov [Wed, 9 May 2018 19:46:05 +0000 (19:46 +0000)]
Merge "Log wipe failure" into pi-dev
Pavel Grafov [Wed, 9 May 2018 19:46:00 +0000 (19:46 +0000)]
Merge "Acquire lock before calling getDeviceOwnerAdminLocked" into pi-dev
Victor Hsieh [Wed, 9 May 2018 19:37:38 +0000 (12:37 -0700)]
Merge "Allow only selected priv apps to run OOB" into pi-dev
am:
792d36c170
Change-Id: Iad80a321e1b76f19935a23290594a36fd057840c
Calin Juravle [Sat, 5 May 2018 00:35:29 +0000 (17:35 -0700)]
Add cmd package shell command for taking profile snapshots
Test: adb shell cmd package snapshot-profile pkgname
Bug:
74081010
(cherry picked from commit
21216c6a0323b0b63c9c5712f98fc8f7879dd8c1)
Merged-In: I96d73959cb46194667c7801767a9ebd44fd72d90
Change-Id: I96d73959cb46194667c7801767a9ebd44fd72d90
android-build-team Robot [Wed, 9 May 2018 19:31:19 +0000 (12:31 -0700)]
Merge "Add DIALOG_UPDATABLE_LIST_PREFERENCE into metrics_constants.proto" into pi-dev
am:
cdf52becfe
Change-Id: Id8c132ee28ea25fde6f3fe961340b7a14c088a82
Chia-I Wu [Mon, 7 May 2018 20:17:04 +0000 (13:17 -0700)]
Fix night light and COLOR_MODE_AUTOMATIC
The native mode methods in DisplayTransformManager were used to
decide whether the color matrix works in linear or gamma space. For
COLOR_MODE_AUTOMATIC, the color matrix works in lienar instead of
gamma space.
Fix the native mode methods to be more clear about the intention to
avoid future breakage.
Bug:
79257138
Test: manual and atest FrameworksServicesTests:ColorDisplayServiceTest
Change-Id: Ied60a62bd7330e87c3207f2183d7e83af9e51fb7
android-build-prod (mdb) [Wed, 9 May 2018 19:25:58 +0000 (12:25 -0700)]
Merge "AudioService: Do not disconnect SCO started externally" am:
391d919622
am:
43a1ab277d
Change-Id: Ibcb6f30ce82cf049cfbdf299fa53289bf10cf0f3
Victor Hsieh [Wed, 9 May 2018 19:21:22 +0000 (19:21 +0000)]
Merge "Allow only selected priv apps to run OOB" into pi-dev
android-build-prod (mdb) [Wed, 9 May 2018 19:19:06 +0000 (12:19 -0700)]
Merge "AudioService: Do not disconnect SCO started externally"
am:
391d919622
Change-Id: Iebcdb6d451755993cfee81250721a03b0f378edf
android-build-team Robot [Wed, 9 May 2018 19:18:28 +0000 (19:18 +0000)]
Merge "Add DIALOG_UPDATABLE_LIST_PREFERENCE into metrics_constants.proto" into pi-dev
android-build-team Robot [Wed, 9 May 2018 19:07:54 +0000 (12:07 -0700)]
Merge "Reset password field instead of keyguard" into pi-dev
am:
a7e5dd3b33
Change-Id: Ie0bafa034085289f2b726b572064bcd5aa8d0cbf
android-build-team Robot [Wed, 9 May 2018 19:01:38 +0000 (12:01 -0700)]
Merge "Update the Open Mobile API version" into pi-dev
am:
dcb8ec66c5
Change-Id: I15c30a728f5447656a75d9d77446b0517b186a6e
Pavel Grafov [Wed, 9 May 2018 18:57:05 +0000 (11:57 -0700)]
Merge "Lock profiles when lockdown is invoked." into pi-dev
am:
e4ea18c1ff
Change-Id: Iae83cc6911edbffd949c44c481b8962bd12404bc
android-build-team Robot [Wed, 9 May 2018 18:46:43 +0000 (11:46 -0700)]
Merge "Move libstatssocket to system/ so that lmkd can build on PDK." into pi-dev
am:
8ca46fc4ac
Change-Id: I70b7f3187da66eb720d1bc0c5ac83658ea4a6280
android-build-team Robot [Wed, 9 May 2018 18:40:04 +0000 (11:40 -0700)]
Merge "Fix partial bucket unit tests." into pi-dev
am:
c3d0798455
Change-Id: I44f0aa78defe58a6c04411d76d97631fb808305c
android-build-team Robot [Wed, 9 May 2018 18:35:53 +0000 (18:35 +0000)]
Merge "Reset password field instead of keyguard" into pi-dev
android-build-team Robot [Wed, 9 May 2018 18:35:47 +0000 (18:35 +0000)]
Merge "Update the Open Mobile API version" into pi-dev
Pavel Grafov [Wed, 9 May 2018 18:29:24 +0000 (18:29 +0000)]
Merge "Lock profiles when lockdown is invoked." into pi-dev
Matthew Ng [Wed, 9 May 2018 18:18:08 +0000 (11:18 -0700)]
Update the snap targets in minimized mode to reflect the correct targets
am:
6317df6e1e
Change-Id: I082df8125b71e7e27d1a8cf953cf43d18909cd2f
Patrick Baumann [Wed, 9 May 2018 18:12:49 +0000 (11:12 -0700)]
Allows disk reads when adding native paths to classloader
In the cases that the classloader is being updated on the main thread,
temporarily allows disk reads so that native paths can be checked for
directory vs. APK.
Change-Id: I89cab9c7fcb71b8eff8891db974285844affe220
Fixes:
79425683
Test: atest WebViewHostSideStartupTest
Mehdi Alizadeh [Fri, 4 May 2018 22:51:56 +0000 (15:51 -0700)]
Adds overlay field for Swipe Up gesture's default opt-in value
Bug:
78641268
Test: Manual test
Change-Id: I0386629ee55a3752fdf211b36cacdcc10ac00f97
android-build-team Robot [Wed, 9 May 2018 18:08:46 +0000 (18:08 +0000)]
Merge "Move libstatssocket to system/ so that lmkd can build on PDK." into pi-dev
android-build-team Robot [Wed, 9 May 2018 18:07:24 +0000 (18:07 +0000)]
Merge "Fix partial bucket unit tests." into pi-dev
Calin Juravle [Wed, 9 May 2018 18:06:35 +0000 (11:06 -0700)]
Merge "Allow the shell user to snapshot profiles for debuggable apps" into pi-dev
am:
a5f20a8df4
Change-Id: I4e26849f2b326039b3514e99f938157560ce5758
android-build-team Robot [Wed, 9 May 2018 17:54:26 +0000 (10:54 -0700)]
Merge "Change the root of trust for CryptAuth Vault Service" into pi-dev
am:
738b0a8b42
Change-Id: I72d073373a8365b7a047dd23d91d26205ffdaec9
android-build-prod (mdb) [Wed, 9 May 2018 17:52:34 +0000 (17:52 +0000)]
Merge "AudioService: Do not disconnect SCO started externally"
Android Build Merger (Role) [Wed, 9 May 2018 17:49:31 +0000 (17:49 +0000)]
Merge "[automerger skipped] Merge "Make TelecomManager#endCall a public API." am:
d63982cc03 am:
939a78b470 -s ours" into pi-dev-plus-aosp
Matthew Ng [Fri, 4 May 2018 22:42:54 +0000 (15:42 -0700)]
Update the snap targets in minimized mode to reflect the correct targets
In minimized mode there is only 1 split snap target compared to regular
portrait that has 30%, 50%, 70% targets. Update the accessibility options
for minimized mode to reflect the correct targets. Also removed the
middle target if there is only 1 split snap target.
Test: using talkback, see custom options on divider handle in minimized
mode
Fixes:
78304300
Change-Id: I8421499616cf0fe503c1f6a081a2151098640a9c
Tyler Gunn [Wed, 9 May 2018 17:48:21 +0000 (10:48 -0700)]
[automerger skipped] Merge "Make TelecomManager#endCall a public API." am:
d63982cc03
am:
939a78b470 -s ours
Change-Id: Id907cb06a70f8635dd1319a5b8496f0036f15d49
Nathan Harold [Wed, 9 May 2018 17:46:20 +0000 (10:46 -0700)]
Merge "[DO NOT MERGE] Use INetd Constant for IpSec Interface Prefix" into pi-dev
am:
712b92920a
Change-Id: I09fe6255126cefbbf165bc1f8af031c17aead7d1
android-build-team Robot [Wed, 9 May 2018 17:41:38 +0000 (10:41 -0700)]
Merge "Set app name when notification is updated" into pi-dev
am:
c9e47020a3
Change-Id: I339d9e55489173381f987d3e2ad57df148511e89
Calin Juravle [Wed, 9 May 2018 17:41:00 +0000 (17:41 +0000)]
Merge "Allow the shell user to snapshot profiles for debuggable apps" into pi-dev
Tyler Gunn [Wed, 9 May 2018 17:35:20 +0000 (10:35 -0700)]
Merge "Make TelecomManager#endCall a public API."
am:
d63982cc03
Change-Id: Iea39f42a96cb004cf69caaf5ba732d3b14060336
android-build-team Robot [Wed, 9 May 2018 17:34:46 +0000 (10:34 -0700)]
Merge "Greylist updates, Wednesday edition." into pi-dev
am:
618418af09
Change-Id: I2cf00028bc42b517e35eec5c589f2998facf746e
android-build-team Robot [Wed, 9 May 2018 17:29:06 +0000 (17:29 +0000)]
Merge "Change the root of trust for CryptAuth Vault Service" into pi-dev
Pavel Grafov [Tue, 8 May 2018 17:06:22 +0000 (18:06 +0100)]
Log wipe failure
Test: injected an error into RecoverySystem.rebootWipeUserData
Fixes:
79417596
Change-Id: I3fef4bdd2f6357b08be4976c35c651908e9b3599
Nathan Harold [Wed, 9 May 2018 17:27:13 +0000 (17:27 +0000)]
Merge "[DO NOT MERGE] Use INetd Constant for IpSec Interface Prefix" into pi-dev
android-build-team Robot [Wed, 9 May 2018 17:25:03 +0000 (10:25 -0700)]
Merge "Fix a typo in the API doc of TextView#setKeyListener()" into pi-dev
am:
643d9256d9
Change-Id: I3eeea369b2a073e3e5ab03c21a1559947bed51ec
Tim Murray [Wed, 2 May 2018 22:14:35 +0000 (15:14 -0700)]
ActivityManagerService: explicitly break connection cycles
Currently, it is possible for two services to bind to each other and
receive each other's oom_adj, even if there are no other bindings that
would cause either process to be promoted. This causes a pair of
services to remain at a higher oom_adj level than they intended if
one service was promoted by a binding that was later destroyed.
To fix this, any process that encounters a cycle will be marked for a
later adjustment, and those bindings that encounter a cycle will not be
used to promote processes. After the initial oom_adj adjustments, all
processes that encountered a cycle will be retried. These retries will
continue until no process that encountered a cycle changes its process
state, at which point the process states should be stable.
Test: CTS; boots; runs normally
bug
78894563
Change-Id: I7cb2aa2fc461c08bc8e7f687a673249aef78351b
android-build-team Robot [Wed, 9 May 2018 17:20:52 +0000 (10:20 -0700)]
Merge "Print correct version code when skipping outdated system packages" into pi-dev
am:
bf22d134cc
Change-Id: I1fcd341b2e7f21c8f9f507fdd718ebf328a7367b
android-build-team Robot [Wed, 9 May 2018 17:20:02 +0000 (17:20 +0000)]
Merge "Set app name when notification is updated" into pi-dev
Pavel Grafov [Wed, 2 May 2018 12:44:46 +0000 (13:44 +0100)]
Lock profiles when lockdown is invoked.
Change-Id: I3abfa464255b0fc04a09657b8ca43bcc154621c0
Bug:
76208903
Test: manually invoked lockdown in all combinations.
android-build-team Robot [Wed, 9 May 2018 17:16:22 +0000 (10:16 -0700)]
Merge changes I5851dd16,Id196307f into pi-dev
am:
8d6571aeed
Change-Id: If389a3822b5bd51e4b714c1dde5cf17122d3ce8e
android-build-team Robot [Wed, 9 May 2018 17:13:26 +0000 (17:13 +0000)]
Merge "Greylist updates, Wednesday edition." into pi-dev
android-build-team Robot [Wed, 9 May 2018 17:08:13 +0000 (10:08 -0700)]
Merge "Changed doze-light timeouts" into pi-dev
am:
d99e347f39
Change-Id: I6e808f806f4b3f84a1fd16fa58936ae44266e13b
android-build-team Robot [Wed, 9 May 2018 17:06:33 +0000 (17:06 +0000)]
Merge "Fix a typo in the API doc of TextView#setKeyListener()" into pi-dev
android-build-team Robot [Wed, 9 May 2018 17:01:27 +0000 (17:01 +0000)]
Merge "Print correct version code when skipping outdated system packages" into pi-dev
Leon Scroggins [Wed, 9 May 2018 17:00:57 +0000 (10:00 -0700)]
Merge "Allow AssetStreamAdaptor to be seekable" into pi-dev
am:
b69f7c9e0b
Change-Id: I2d70827a484b5db52759f34c0999e400bb11c82d
android-build-team Robot [Wed, 9 May 2018 16:55:26 +0000 (16:55 +0000)]
Merge changes I5851dd16,Id196307f into pi-dev
* changes:
OMS: harden permission checks
Add missing fields to OverlayInfo.hashCode
Leon Scroggins [Wed, 9 May 2018 16:54:47 +0000 (09:54 -0700)]
Merge "Use filtering when drawing nine-patches" into pi-dev
am:
b638985cc1
Change-Id: Id7dfab69b931a96d802c0ab43a06fc74267aff5c
android-build-team Robot [Wed, 9 May 2018 16:54:17 +0000 (16:54 +0000)]
Merge "Changed doze-light timeouts" into pi-dev
Pavel Grafov [Wed, 9 May 2018 16:19:04 +0000 (17:19 +0100)]
Acquire lock before calling getDeviceOwnerAdminLocked
Change-Id: I318c7cea8e9b7de2dc9fa05f786524848c9c76dd
Fixes:
79418618
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement
Leon Scroggins [Wed, 9 May 2018 16:40:01 +0000 (16:40 +0000)]
Merge "Allow AssetStreamAdaptor to be seekable" into pi-dev
Leon Scroggins [Wed, 9 May 2018 16:38:41 +0000 (16:38 +0000)]
Merge "Use filtering when drawing nine-patches" into pi-dev
Lucas Dupin [Wed, 9 May 2018 00:06:06 +0000 (17:06 -0700)]
Reset password field instead of keyguard
Reseting the keyguard has bigger implications, like hiding the bouncer
and resetting the StatusBarKeyguardViewManager.
Change-Id: Ib17e292c8c95ba19f4149ee04fc9680c69029a42
Fixes:
79187948
Test: go/sysui-bouncer-tests
android-build-team Robot [Wed, 9 May 2018 16:37:59 +0000 (09:37 -0700)]
Merge "AudioService: Do not disconnect SCO started externally" into pi-dev
am:
b5eca33bca
Change-Id: I7798cc7111b943d8cf76739b1501875e2d243758
android-build-team Robot [Wed, 9 May 2018 16:31:07 +0000 (09:31 -0700)]
Merge "Fix NPE in package manager when asserting overlays" into pi-dev
am:
61554708ba
Change-Id: Id3ed6fd761042fe16a15e5774047070c63cd5d22
Tyler Gunn [Wed, 9 May 2018 16:22:44 +0000 (16:22 +0000)]
Merge "Make TelecomManager#endCall a public API."
Android Build Merger (Role) [Wed, 9 May 2018 16:20:58 +0000 (16:20 +0000)]
Merge "[automerger skipped] Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b am:
6982bf4bde am:
1bc3c74685 -s ours" into pi-dev-plus-aosp
David Brazdil [Wed, 9 May 2018 16:20:34 +0000 (09:20 -0700)]
[automerger skipped] Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b am:
6982bf4bde
am:
1bc3c74685 -s ours
Change-Id: I4f1c1a94cde7d35d6ae2239aa1a42b4d6f47056c
Rubin Xu [Wed, 9 May 2018 16:20:25 +0000 (09:20 -0700)]
Merge "Allow profile owner to disable iris/face on personal keyguard" into pi-dev
am:
54a514eda0
Change-Id: I8516f3ffa4c655195da3863d6ac23ab52af4ef70
android-build-team Robot [Wed, 9 May 2018 16:20:20 +0000 (16:20 +0000)]
Merge "AudioService: Do not disconnect SCO started externally" into pi-dev
OSDN Git Service
