OSDN Git Service
Elliott Hughes [Fri, 23 Mar 2018 20:34:17 +0000 (20:34 +0000)]
Merge "Prune files from /data/anr/ by number as well as age." am:
6941fcd88c am:
0e4c1e8ce3
am:
f37a1f9817
Change-Id: I350398df443732bb63b65810368ad3bb9ceecaa7
Hansong Zhang [Fri, 23 Mar 2018 20:30:01 +0000 (20:30 +0000)]
Merge "Hearing Aid Profile: set and get activeDevice" into pi-dev am:
9753e774ce
am:
a84feb191f
Change-Id: Iafb183f45d52ed070363ad320175e117b9645d7f
Makoto Onuki [Fri, 23 Mar 2018 20:21:56 +0000 (20:21 +0000)]
Merge "Remove EBS notification" into pi-dev am:
86c9db64a7
am:
57f762169a
Change-Id: Ic7cab0b1b0a434e9f11e4b1c30ddea0876777e07
TreeHugger Robot [Fri, 23 Mar 2018 20:09:11 +0000 (20:09 +0000)]
Merge "Clean up SettingsLib dependencies"
Alice Sheng [Fri, 23 Mar 2018 20:08:08 +0000 (20:08 +0000)]
Merge "Add setting for disabling swap." into pi-dev am:
7384995cf8
am:
6036a2b5bf
Change-Id: I97924e33ad994858369492e70db6d48d51ad1f70
Elliott Hughes [Fri, 23 Mar 2018 20:07:03 +0000 (20:07 +0000)]
Merge "Prune files from /data/anr/ by number as well as age." am:
6941fcd88c
am:
0e4c1e8ce3
Change-Id: Ib22b546b4e2e9cad86680ed5cc8c7f8a55488585
Hansong Zhang [Fri, 23 Mar 2018 20:02:44 +0000 (20:02 +0000)]
Merge "Hearing Aid Profile: set and get activeDevice" into pi-dev
am:
9753e774ce
Change-Id: I39f848921e56d07d78397509687bc56b39a83e79
Kurt Marcinkiewicz [Fri, 23 Mar 2018 20:00:05 +0000 (20:00 +0000)]
Merge "Allow specifying a network for SNTP time sync" into pi-dev am:
991b971acb
am:
98be440cfc
Change-Id: I8dfd1cad99c63efdc14c174c19f094a61cdfc44f
Elliott Hughes [Fri, 23 Mar 2018 19:59:34 +0000 (19:59 +0000)]
Merge "Prune files from /data/anr/ by number as well as age."
am:
6941fcd88c
Change-Id: Ic0c9601520dc0c4a515f5cbffc4dd33cc35ae0c4
Makoto Onuki [Fri, 23 Mar 2018 19:55:43 +0000 (19:55 +0000)]
Merge "Remove EBS notification" into pi-dev
am:
86c9db64a7
Change-Id: Ie8c2cae4c6705a7f16d32ef157623ed489371940
Fan Zhang [Fri, 23 Mar 2018 19:52:49 +0000 (19:52 +0000)]
Merge "Force sentence case for free form edit preferences" into pi-dev am:
8e9a1123fa
am:
1399366c39
Change-Id: I2ed3ecddf6a80aa62ecee42fb7fa218be1dfefa4
Yu-Han Yang [Fri, 23 Mar 2018 19:47:12 +0000 (19:47 +0000)]
Merge "Make NLP/FLP location request behavior consistent" into pi-dev am:
d613363920
am:
6e5b7c46df
Change-Id: I60096282c4b6a56327039853fb8a2c6b9a126245
Alice Sheng [Fri, 23 Mar 2018 19:47:06 +0000 (19:47 +0000)]
Merge "Add setting for disabling swap." into pi-dev
am:
7384995cf8
Change-Id: I2a8207237a5cf2e0b2d1be0996aece7542d9b90d
Tony Mak [Fri, 23 Mar 2018 19:41:48 +0000 (19:41 +0000)]
Merge "Fix IME is not working after reboot in kiosk mode" into pi-dev am:
fb933aef6b
am:
5424548230
Change-Id: I175da66281470b0ee4d64fd70b8ee4f57039f61c
Kurt Marcinkiewicz [Fri, 23 Mar 2018 19:40:39 +0000 (19:40 +0000)]
Merge "Allow specifying a network for SNTP time sync" into pi-dev
am:
991b971acb
Change-Id: I339c77063c72a9d76a5c4cb17052e20fb6e045a6
Tej Singh [Fri, 23 Mar 2018 19:34:32 +0000 (19:34 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled""" am:
827a150646 am:
428e05ac6c
am:
51d869b41a
Change-Id: Id027d92bd64504fbd3495fa9b343a28a884cc992
Svet Ganov [Fri, 23 Mar 2018 19:22:04 +0000 (19:22 +0000)]
Merge "Fix resource by name lookup" into pi-dev am:
909402935c
am:
404231b3bf
Change-Id: I25bb90f1b150a2bac45ea8a8ccbb3604cfdc31e9
Fan Zhang [Fri, 23 Mar 2018 19:19:51 +0000 (19:19 +0000)]
Merge "Force sentence case for free form edit preferences" into pi-dev
am:
8e9a1123fa
Change-Id: I5fbcd8b575f111fbc5ac460e471913790523b44d
Petr Cermak [Fri, 23 Mar 2018 19:17:06 +0000 (19:17 +0000)]
Merge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev am:
4341a66b03
am:
fcca48b648
Change-Id: Id8880eb77a36a137756ed329469079d699aaf042
Yu-Han Yang [Fri, 23 Mar 2018 19:17:04 +0000 (19:17 +0000)]
Merge "Make NLP/FLP location request behavior consistent" into pi-dev
am:
d613363920
Change-Id: I8b70a343320a3e3d2445744b7135e0a087d37312
David Chen [Fri, 23 Mar 2018 19:12:22 +0000 (19:12 +0000)]
Merge "Fix statsd dropping metrics data." into pi-dev am:
dc2dda5c49
am:
df8db0e01e
Change-Id: I0343a9231e95bec8932e1f4959b5e928eebb57d3
Tony Mak [Fri, 23 Mar 2018 19:11:37 +0000 (19:11 +0000)]
Merge "Fix IME is not working after reboot in kiosk mode" into pi-dev
am:
fb933aef6b
Change-Id: Iace533478e1ab9be5a911c7e6711be00631ad203
Mihai Popa [Fri, 23 Mar 2018 19:07:49 +0000 (19:07 +0000)]
Merge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev am:
14372aaabc
am:
3c0ad631d5
Change-Id: I66801721fbbf1b60b1e1523555b8f990807ccf05
Tej Singh [Fri, 23 Mar 2018 19:06:02 +0000 (19:06 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled""" am:
827a150646
am:
428e05ac6c
Change-Id: I54932a1b45870a75450a605584f09b797a9f2298
David Brazdil [Fri, 23 Mar 2018 19:02:15 +0000 (19:02 +0000)]
Merge "Whitelist com.android.perftests.core in am instrument." into pi-dev am:
600f3bb4fb
am:
ff58551523
Change-Id: I0a2b26d835e077e1151afa0f630a66ce287a22e4
Svet Ganov [Fri, 23 Mar 2018 19:00:33 +0000 (19:00 +0000)]
Merge "Fix resource by name lookup" into pi-dev
am:
909402935c
Change-Id: I6eadfe944f1f2893deb8f9fc6d72e6e3c7171d5e
Tej Singh [Fri, 23 Mar 2018 18:57:43 +0000 (18:57 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled"""
am:
827a150646
Change-Id: I38a7a8e0124b14d394db96b61d2ac6ceacf4bdb9
Dmitry Dementyev [Fri, 23 Mar 2018 18:57:22 +0000 (18:57 +0000)]
Merge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey method." into pi-dev am:
95f2965a74
am:
64a9487249
Change-Id: Ie1468db0c0a71233895ec9e1cc61665146c6f791
Petr Cermak [Fri, 23 Mar 2018 18:55:42 +0000 (18:55 +0000)]
Merge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev
am:
4341a66b03
Change-Id: I0d1a41c52cfe2b24eaa23cbd8fc49a6ae6493c2f
David Chen [Fri, 23 Mar 2018 18:50:20 +0000 (18:50 +0000)]
Merge "Fix statsd dropping metrics data." into pi-dev
am:
dc2dda5c49
Change-Id: I83ef6b23ecd0083658f011c5248e0c6cfe9bec92
Mihai Popa [Fri, 23 Mar 2018 18:44:38 +0000 (18:44 +0000)]
Merge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev
am:
14372aaabc
Change-Id: I809c725f2bc11929047a7047b4b24a7edbc1260b
Android Build Merger (Role) [Fri, 23 Mar 2018 18:42:07 +0000 (18:42 +0000)]
Merge changes from topic "am-
539574293c0c44efb365f30984f997d2"
* changes:
Merge changes from topic "bug73953366_bug74605221" into pi-dev am:
7ed5fb3e1d am:
a87c6da04b
Camera: Camera shouldn't throw 'RejectedExecutionException' am:
b9a5194e9e am:
ca5ffee316
Revert "Revert "Camera: SessionConfiguration should use Executors"" am:
77ca866b53 am:
f18ec57381
Emilian Peev [Fri, 23 Mar 2018 18:40:44 +0000 (18:40 +0000)]
Merge changes from topic "bug73953366_bug74605221" into pi-dev am:
7ed5fb3e1d
am:
a87c6da04b
Change-Id: I4ef17c30e731fe96628d39fa8bcf6b8eb7c49ae8
David Brazdil [Fri, 23 Mar 2018 18:37:13 +0000 (18:37 +0000)]
Merge "Whitelist com.android.perftests.core in am instrument." into pi-dev
am:
600f3bb4fb
Change-Id: I6fba00155940fe5172be84254af1ce5cc077ac4a
Emilian Peev [Fri, 23 Mar 2018 18:36:51 +0000 (18:36 +0000)]
Camera: Camera shouldn't throw 'RejectedExecutionException' am:
b9a5194e9e
am:
ca5ffee316
Change-Id: I1f659f2b7a5e2af801b2508e8d8bfd36b9194e05
Emilian Peev [Fri, 23 Mar 2018 18:33:45 +0000 (18:33 +0000)]
Revert "Revert "Camera: SessionConfiguration should use Executors"" am:
77ca866b53
am:
f18ec57381
Change-Id: Iad789b80b193b535a517c991894cc29046e517b1
TreeHugger Robot [Fri, 23 Mar 2018 18:32:22 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE"
Dmitry Dementyev [Fri, 23 Mar 2018 18:31:59 +0000 (18:31 +0000)]
Merge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey method." into pi-dev
am:
95f2965a74
Change-Id: I2e44ca18a1f3fa928f3a3529a1425a483dd34d06
TreeHugger Robot [Fri, 23 Mar 2018 18:25:27 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 23 Mar 2018 18:22:27 +0000 (18:22 +0000)]
Merge "Hearing Aid Profile: set and get activeDevice" into pi-dev
Emilian Peev [Fri, 23 Mar 2018 18:20:08 +0000 (18:20 +0000)]
Merge changes from topic "bug73953366_bug74605221" into pi-dev
am:
7ed5fb3e1d
Change-Id: I5d435b2c2edfeaaca0e12f1af222680f71dad2fc
Emilian Peev [Fri, 23 Mar 2018 18:15:35 +0000 (18:15 +0000)]
Camera: Camera shouldn't throw 'RejectedExecutionException'
am:
b9a5194e9e
Change-Id: Ic4dd87d89f91822fce82c5ca27632f69716279e5
Makoto Onuki [Fri, 23 Mar 2018 18:14:30 +0000 (18:14 +0000)]
Merge "Remove EBS notification" into pi-dev
Alice Sheng [Fri, 23 Mar 2018 18:11:12 +0000 (18:11 +0000)]
Merge "Add setting for disabling swap." into pi-dev
Emilian Peev [Fri, 23 Mar 2018 18:11:10 +0000 (18:11 +0000)]
Revert "Revert "Camera: SessionConfiguration should use Executors""
am:
77ca866b53
Change-Id: I226e1ba33047695b74ce5de9054c4760e61bf773
Stan Iliev [Fri, 23 Mar 2018 18:07:20 +0000 (18:07 +0000)]
Merge "Clear the frame buffer for F16 pixel format" into pi-dev am:
13269764e5
am:
f32a9c0c08
Change-Id: I1283bb9fca81027ff87c2e18f19d701822830f00
Kurt Marcinkiewicz [Fri, 23 Mar 2018 18:02:19 +0000 (18:02 +0000)]
Merge "Allow specifying a network for SNTP time sync" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 18:01:13 +0000 (18:01 +0000)]
Merge "Force sentence case for free form edit preferences" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 18:00:53 +0000 (18:00 +0000)]
Merge "Make NLP/FLP location request behavior consistent" into pi-dev
Dmitry Dementyev [Fri, 23 Mar 2018 17:55:23 +0000 (17:55 +0000)]
Merge "Remove 17 bytes length restriction for vaultHandler." into pi-dev am:
d9e1a8fd68
am:
a7767c9fcc
Change-Id: I7a9c00234159f3873744f2a33dd2d50ec6720ce6
TreeHugger Robot [Fri, 23 Mar 2018 17:55:06 +0000 (17:55 +0000)]
Merge "Fix IME is not working after reboot in kiosk mode" into pi-dev
Tony Mak [Wed, 21 Mar 2018 15:45:52 +0000 (15:45 +0000)]
Fix IME is not working after reboot in kiosk mode
Problem:
If there is no secure lock screen and the device is in kiosk mode,
ime is not working after reboot
Reason:
Reboot -> starting kiosk activity in lock task mode -> AMS tries to
disable the keyguard while the "swipe to unlock" keyguard is showing.
mNeedToReshowWhenReenabled is set to be True, and system still considers
the keyguard is On (i.e. keyguardOn returns True). Thus, IME is not
allowed to bring up the window.
For the seucre lock screen case, it is fine because:
Reboot -> DE storage -> user enters credentail to unlock it ->
CE storage -> bring up kiosk activity in lock task mode -> AMS
disables keyguard while keyguard is already dismissed.
Solution:
Special handling the non secure case.
Dismiss the keyguard before disabling it.
FIXES:
74381063
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testLockTaskAfterReboot_deviceOwnerUser
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_deviceOwnerUser
Change-Id: I31ea924fff6f63741e74c36ef3c90c6b78fc9fe9
TreeHugger Robot [Fri, 23 Mar 2018 17:51:24 +0000 (17:51 +0000)]
Merge "Fix resource by name lookup" into pi-dev
Stan Iliev [Fri, 23 Mar 2018 17:47:35 +0000 (17:47 +0000)]
Merge "Clear the frame buffer for F16 pixel format" into pi-dev
am:
13269764e5
Change-Id: I95a5645e16a9431a57be6b23dcd9c95075957aac
Dmitry Dementyev [Fri, 23 Mar 2018 17:43:59 +0000 (17:43 +0000)]
Merge "Remove 17 bytes length restriction for vaultHandler." into pi-dev
am:
d9e1a8fd68
Change-Id: Ia02500da76876aae8649f40812a5d3451ad49459
Dmitry Dementyev [Fri, 23 Mar 2018 17:42:47 +0000 (17:42 +0000)]
Merge "Update RecoverableKeyStoreManager methods to throw NullPointerException when null is passed as @NonNull argument." into pi-dev am:
364dbf1c9e
am:
e7250b6ec6
Change-Id: I283fa89f8da060180bfc89d4eb5ec61e5e43ff4c
TreeHugger Robot [Fri, 23 Mar 2018 17:40:56 +0000 (17:40 +0000)]
Merge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 17:40:18 +0000 (17:40 +0000)]
Merge "Fix statsd dropping metrics data." into pi-dev
Mihai Popa [Fri, 23 Mar 2018 17:39:04 +0000 (17:39 +0000)]
Merge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 17:38:26 +0000 (17:38 +0000)]
Merge "Don't build android.test.mock.stubs for unbundled builds"
Elliott Hughes [Fri, 23 Mar 2018 17:36:23 +0000 (17:36 +0000)]
Merge "Prune files from /data/anr/ by number as well as age."
David Brazdil [Fri, 23 Mar 2018 17:34:19 +0000 (17:34 +0000)]
Merge "Whitelist com.android.perftests.core in am instrument." into pi-dev
Treehugger Robot [Fri, 23 Mar 2018 17:29:36 +0000 (17:29 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled"""
Leif Hendrik Wilden [Fri, 23 Mar 2018 17:22:33 +0000 (17:22 +0000)]
Merge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev am:
f3f86dd09e
am:
9f73182dfa
Change-Id: I7e86dbdc4d194890174b72b41ac09f306a26122c
Dmitry Dementyev [Fri, 23 Mar 2018 17:22:26 +0000 (17:22 +0000)]
Merge "Update RecoverableKeyStoreManager methods to throw NullPointerException when null is passed as @NonNull argument." into pi-dev
am:
364dbf1c9e
Change-Id: I6ad01aa0dace567c6c6da67435213bbe8a9e63f3
Jakub Pawlowski [Fri, 23 Mar 2018 17:16:35 +0000 (17:16 +0000)]
Merge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into pi-dev am:
85e7716a14
am:
1f5d8f62a4
Change-Id: I78d01735a78d25953b888dbcaecf02cd26d061c9
Leif Hendrik Wilden [Fri, 23 Mar 2018 17:16:24 +0000 (17:16 +0000)]
Merge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev
am:
f3f86dd09e
Change-Id: I4e6b2ea56e3e97fe8bc15424decd19e26085e5f0
Dmitry Dementyev [Fri, 23 Mar 2018 17:16:17 +0000 (17:16 +0000)]
Merge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey method." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 17:16:00 +0000 (17:16 +0000)]
Merge changes from topic "bug73953366_bug74605221" into pi-dev
* changes:
Camera: Complete transition from handlers to executors
Camera: Camera shouldn't throw 'RejectedExecutionException'
Revert "Revert "Camera: SessionConfiguration should use Executors""
TreeHugger Robot [Fri, 23 Mar 2018 17:14:01 +0000 (17:14 +0000)]
Merge "Clear the frame buffer for F16 pixel format" into pi-dev
Dmitry Dementyev [Fri, 23 Mar 2018 17:08:48 +0000 (17:08 +0000)]
Merge "Remove 17 bytes length restriction for vaultHandler." into pi-dev
Jakub Pawlowski [Fri, 23 Mar 2018 17:08:45 +0000 (17:08 +0000)]
Merge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into pi-dev
am:
85e7716a14
Change-Id: I6a8a88054bf115b1d02139c988f8ca062795d055
Dmitry Dementyev [Fri, 23 Mar 2018 17:06:18 +0000 (17:06 +0000)]
Merge "Update RecoverableKeyStoreManager methods to throw NullPointerException when null is passed as @NonNull argument." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 17:06:02 +0000 (17:06 +0000)]
Merge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev
Mathew Inwood [Fri, 23 Mar 2018 17:01:26 +0000 (17:01 +0000)]
[automerger skipped]Merge "resolve merge conflicts of
daef557352934e5a6e20a45bd2a01c832f657e42 to pi-dev-plus-aosp" into pi-dev-plus-aosp
am:
c9c72d26af -s ours
Change-Id: I24d1346aaf8c46ad8a524d786498bc2e8f7de8a4
TreeHugger Robot [Fri, 23 Mar 2018 16:56:31 +0000 (16:56 +0000)]
Merge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into pi-dev
Mathew Inwood [Fri, 23 Mar 2018 16:48:11 +0000 (16:48 +0000)]
Merge "resolve merge conflicts of
daef557352934e5a6e20a45bd2a01c832f657e42 to pi-dev-plus-aosp" into pi-dev-plus-aosp
Mathew Inwood [Fri, 23 Mar 2018 15:58:52 +0000 (15:58 +0000)]
resolve merge conflicts of
daef557352934e5a6e20a45bd2a01c832f657e42 to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Change-Id: I3d1aeb30b755ca05f32dcd3c46335d1611e0bb50
Ricky Wai [Fri, 23 Mar 2018 16:26:40 +0000 (16:26 +0000)]
Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev am:
651ac4d119
am:
b2528c0291
Change-Id: I7dcd2edd9978577842838513c1e1c4880bb5b3f8
Ricky Wai [Fri, 23 Mar 2018 16:19:46 +0000 (16:19 +0000)]
Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev
am:
651ac4d119
Change-Id: Ie468743be5b369e49eacda9707e76e010639a7fe
David Brazdil [Fri, 23 Mar 2018 16:17:21 +0000 (16:17 +0000)]
Merge "Add hidden API on light greylist" into pi-dev am:
a63484c0d6
am:
3f8be75c1f
Change-Id: I8ab7ab024cb58a641b564b048cf1830e7456e372
David Brazdil [Fri, 23 Mar 2018 16:05:41 +0000 (16:05 +0000)]
Merge "Add hidden API on light greylist" into pi-dev
am:
a63484c0d6
Change-Id: Ibb80e612711777dfecf3c0b0385a3573924acda4
Ralph Nathan [Fri, 23 Mar 2018 16:02:37 +0000 (16:02 +0000)]
Merge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev am:
4a94e42bed
am:
db9619d725
Change-Id: If920163810ecb4501a2b4a1740074efd0462ed18
Bo Zhu [Fri, 23 Mar 2018 15:57:36 +0000 (15:57 +0000)]
Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev am:
9ec7026e92
am:
2e815c6e74
Change-Id: I3374a90dbdee1feb2eeecd054da6069c3e630802
Ricky Wai [Fri, 23 Mar 2018 15:55:28 +0000 (15:55 +0000)]
Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev
Petr Cermak [Fri, 16 Mar 2018 10:23:00 +0000 (10:23 +0000)]
Annotate RemoteInput#SOURCE_* with @IntDef
This patch addresses a request from the API Council (http://b/
74409378).
It defines a new RemoteInput.Source annotation for RemoteInput source
constants.
Bug:
74409378
Test: atest RemoteInputTest
Change-Id: I78a006b6a600ea0c0603b2591d1a29596074a44e
Bill Yi [Fri, 23 Mar 2018 15:50:49 +0000 (08:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26ee0150a4ac35ce2cb5aa9cacc8e6c2265ffd7b
Auto-generated-cl: translation import
Ralph Nathan [Fri, 23 Mar 2018 15:49:05 +0000 (15:49 +0000)]
Merge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev
am:
4a94e42bed
Change-Id: I02a0a70021875cc2efbda56bd71e91136acf4519
Bo Zhu [Fri, 23 Mar 2018 15:44:56 +0000 (15:44 +0000)]
Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev
am:
9ec7026e92
Change-Id: I0026b0ef43e9918811591f416a370dff84254df4
David Brazdil [Fri, 23 Mar 2018 15:41:11 +0000 (15:41 +0000)]
Merge "Add hidden API on light greylist" into pi-dev
Alan Viverette [Wed, 21 Mar 2018 19:07:32 +0000 (15:07 -0400)]
Clean up SettingsLib dependencies
v14-preferences is an empty lib and libraries cannot directly
reference other libraries' R classes due to a bug in Make builds
Bug:
73250914
Bug:
74248169
Test: make && make checkbuild
Change-Id: Id156b2a2140cabc98b58b5312ea28da42f4ca63b
arangelov [Fri, 23 Mar 2018 15:28:22 +0000 (15:28 +0000)]
Merge "Add debug logs for TransferOwnershipMetadataManagerTest cases." into pi-dev am:
3384343629
am:
545024f7f9
Change-Id: I17cece56a15ba5b24556941c32cb09662cdbc938
Ralph Nathan [Fri, 23 Mar 2018 15:26:55 +0000 (15:26 +0000)]
Merge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev
Bo Zhu [Fri, 23 Mar 2018 15:25:36 +0000 (15:25 +0000)]
Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev
Nicolas Geoffray [Fri, 23 Mar 2018 15:00:50 +0000 (15:00 +0000)]
Whitelist com.android.perftests.core in am instrument.
Test is using private APIs.
Bug:
64382372
Bug:
74963051
Bug:
76162083
Test: make
Change-Id: I053b89327944e3722f2c11a9bc83ed1676fa9f85
arangelov [Fri, 23 Mar 2018 15:18:53 +0000 (15:18 +0000)]
Merge "Add debug logs for TransferOwnershipMetadataManagerTest cases." into pi-dev
am:
3384343629
Change-Id: Ia9a8fb3b04b39327b96c6b219d1e3d61e636980e
TreeHugger Robot [Fri, 23 Mar 2018 15:05:14 +0000 (15:05 +0000)]
Merge "Add debug logs for TransferOwnershipMetadataManagerTest cases." into pi-dev
Mathew Inwood [Fri, 23 Mar 2018 15:02:12 +0000 (15:02 +0000)]
Merge "More flexible API enforcement policy."
am:
69e1cbc3fe
Change-Id: I8b54dcbca3991b2b076e0648e3948c80d74351d3
Adrian Roos [Fri, 23 Mar 2018 15:01:49 +0000 (15:01 +0000)]
Merge "DisplayCutout: do not animate cutout (and rounded corner) overlay during rotation" into pi-dev am:
5ee32ac1af
am:
323c56d76e
Change-Id: Ie5ab49761ff1254d19ce326a48ce81fa0e7c1e5d
Adrian Roos [Fri, 23 Mar 2018 14:55:13 +0000 (14:55 +0000)]
Merge "DisplayCutout: do not animate cutout (and rounded corner) overlay during rotation" into pi-dev
am:
5ee32ac1af
Change-Id: Ia811a4d2aa47a41aa4a97d04ac4dcd7b562b48f4
OSDN Git Service
