Paul Hu
982a6e0561
Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: 742ec924e8 am: 57084714d4 am: 3739eed0ce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I02ff8df90f86e25c8845301e11f351407bee0178
2021-01-27 08:01:01 +00:00
Treehugger Robot
35fe58bb8e
Merge "Keystore 2 SPI: Fix KeyStorePublicKey getEncoded()." am: 9e5385798e am: 050882545c am: a38be41f98
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559984
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2aa3d12fc66b123fbba7af6ede0b2a91e159be1d
2021-01-27 07:59:53 +00:00
Josh Gao
a01cecbde9
Merge "Thread.sleep takes milliseconds, not seconds." am: b79bd2867f am: 81830b2d5f am: 629791842e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560108
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie06960dc37d80daebce68bf51e58b1b4cb7c6c0f
2021-01-27 07:59:01 +00:00
Hall Liu
eeb227a688
Merge "Correct name of roaming RTT config" am: b6622aeeb6 am: a083efc121 am: bd4e78b072
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560151
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia49cf8be4d1efd8b63846c39f94cf68937c0c5d2
2021-01-27 07:58:42 +00:00
Treehugger Robot
ed907b9203
Merge "Add app hibernation service stubs" am: d7bac025fb am: d131f3737d am: 1438f59fb0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1544924
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I938d23eada77c80966b710a373de927adf72fae4
2021-01-27 07:56:38 +00:00
Treehugger Robot
4bcc91667c
[automerger skipped] Merge "Add enforcement parameter to RequiresFeature" am: dd438b73cc am: 371eea87de am: 551931360b -s ours
...
am skip reason: Change-Id Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845 with SHA-1 5bfa4239c1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560535
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iacedffbb6da07e13e992cb907bfffeb8606c0c4c
2021-01-27 07:56:25 +00:00
Treehugger Robot
1df1f3f180
Merge "Set OWNERS for core/java/android/app/VoiceInteractor" am: ad1dde5594 am: c0f1148dc6 am: f33a10bffd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557029
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7305b329380ef4b2a5e9406302fc40f000062a7f
2021-01-27 07:56:10 +00:00
Treehugger Robot
652aedd5b2
Merge "Add visibility for new location of permission apex." am: 3525be2175 am: e1c8e59876 am: ab95b3352a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560528
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia25202e2d5f9ea3beffdaaaf6620436804756a7a
2021-01-27 07:55:51 +00:00
Treehugger Robot
173d212718
Merge "Add toddke to owners for system server" am: 4ddafbf58f am: 7a2d9d0613 am: 916c13d45a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559283
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I307e54ea00b5977a5d8e5478081a979e38a52294
2021-01-27 07:55:35 +00:00
Treehugger Robot
0e8e7f4606
Merge "CEC : Add test to check ARC status" am: 2338a4df6b am: a2e9b7cd63 am: 1cc5b4ca0c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I10a1aaac272d509056e5425eeaea5bd29384dae1
2021-01-27 07:55:17 +00:00
Treehugger Robot
88b454286d
Merge "Change order of owners." am: 0d72e983ce am: 81ff12d6c1 am: e364dc06c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556131
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1f16db7fea5e1ac83482da6c3212e03ee4b3923
2021-01-27 07:55:01 +00:00
David Zeuthen
5147877a83
Merge "Identity Credential: API changes for Android 12" am: 40d6635701 am: 6252f82f61 am: 581bf34de0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1464362
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie64aad9ae67a5b62c43edcbf37b841dac60849e2
2021-01-27 07:54:40 +00:00
Treehugger Robot
3827e8c95e
Merge changes I713bc2ec,Ib9ab07c9 am: 3795a7d1d2 am: d8b7ab2076 am: 2d6430198c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b291a4e82b89d3808e9bcd980d5b2aa4d2b1b71
2021-01-27 07:53:30 +00:00
Andrei-Valentin Onea
f789e713e0
Merge "Improve flakiness of PlatformCompatGating test" am: d500b8afd6 am: 8fabad25ca am: e0f9b5217a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icee6d1a99a04131552912b825df449bdb1eec615
2021-01-27 07:53:15 +00:00
Yo Chiang
b82e17ea11
Merge "Fix dynsystem.BootCompletedReceiver" am: cc0ece4108 am: 5d4aa4a1de am: d5c00788c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555905
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If83942ee72e974611164f72c3dbcd9153c8790eb
2021-01-27 07:52:58 +00:00
Yo Chiang
654b416691
[automerger skipped] Merge "Remove feature flag "settings_dynamic_system"" am: 7b84f49b41 am: 3048afdb0a am: db4dc27684 -s ours
...
am skip reason: Change-Id Iedac8763372ef6f11754d3f272f70753fb3d4829 with SHA-1 091f514bf5 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541210
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I20f90e3351c3c9d23cc4606949c5e6ec9ebc9e9b
2021-01-27 07:52:41 +00:00
Benedict Wong
80a0fc52fd
Merge "Remove usage of NetworkInfo" am: bd65203feb am: bf0a284f4e am: 257155acf1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559684
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2f20b39d9f81fc8a6f46c3ec18ebd606400dbac
2021-01-27 07:52:24 +00:00
Rhed Jao
057ad74f9e
[automerger skipped] Merge "Deprecates GET_INTENT_FILTERS in the PackageManager" am: cba3b81738 am: a81e3c0ffc am: 97bf010bc1 -s ours
...
am skip reason: Change-Id I907077b2a07e4a88aa8994ed3c25991b6d1172b4 with SHA-1 940cd5ae33 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473222
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44da2f7a779730074f8dc44a40afafc9a84c405e
2021-01-27 07:52:12 +00:00
Chun-Wei Wang
709db6c079
[automerger skipped] Merge "Pass the correct user id" am: 1d01d76048 am: 132f054eb2 am: b0538566e7 -s ours
...
am skip reason: Change-Id I21b0fa98143f4f1699fe42a37814b3470cea7c1e with SHA-1 4421aee5e0 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie99e20ac0e01444cfdcd883ae88ae4bea77db5e0
2021-01-27 07:51:58 +00:00
Yan Yan
57969c028e
Merge "Expose IPsec tunnel APIs from @SystemApi to public APIs" am: 5b8a0c8d89 am: 67d7fde5ad am: e0662139e0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517517
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6f17fde71e1c7ca36e88e554874939cfc9e78ab
2021-01-27 07:51:43 +00:00
Jeff Sharkey
7414d98d79
Merge "Add owners for shortcut utils" am: f9095c3bc7 am: 22c5c6b246 am: 5694062005
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I330c409c8c8a4f9ba3cd9734fdd4c3b50a4a5e82
2021-01-27 07:51:29 +00:00
Tianjie Xu
bffbf4a64e
[automerger skipped] Merge "Create the ResumeOnRebootService." am: edc7961287 am: 12b77e5e5b am: d6496b0d6b -s ours
...
am skip reason: Change-Id I98378be6963194c2e6faef8ebc441066b75a0bbf with SHA-1 4ace479070 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36f8fd2a0a4c181f658dbd01073de8b65440b735
2021-01-27 07:51:08 +00:00
Hall Liu
326df3e1c1
Merge "Allow carriers to configure RTT while roaming" am: 923d7d28d0 am: 36e819d95f am: 7f159d477f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558908
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b6a2503e38c27abb010073f6f1dcefd9af8e171
2021-01-27 07:50:44 +00:00
Benedict Wong
76b7d4c1eb
Merge "Implement Disconnected state" am: 4f27883485 am: b66cdc3e87 am: 6a762e057a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530784
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2757c1cc8ad6c820e13054d93c9d32d0fb0fa6b
2021-01-27 07:50:24 +00:00
Nikita Ioffe
74c7ba118d
Merge "Fix for TestDirectBootEmulated testcase" am: 0bd1e20da8 am: e69cdcc689 am: 0356d3a9a3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559104
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46a28e9e8408cb52eefa4bc226d2e5e5de033496
2021-01-27 07:50:06 +00:00
Treehugger Robot
7417ec7611
Merge "Update OWNERS files for tests" am: ac64bae06d am: 5fc7bffd49 am: bdf7512708
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559350
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I384c63608284684b2aedb1fac5e64f24e3245cbb
2021-01-27 07:49:50 +00:00
Jeff Sharkey
81457f053c
Merge "Update OWNERS for SigningDetailsTest" am: c934889c91 am: 6ddd93b80e am: c359bbe9a7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9a90c6bb1c4e332c1813f421e1269d6018ea179
2021-01-27 07:49:34 +00:00
Robin Lee
b1c0040462
[automerger skipped] Merge changes from topic "revert-1510032-atv-rro-ZVBUWAKVPO" am: 3d6736d0fd am: 8966a5dd89 am: 1437a142dc -s ours
...
am skip reason: skipped by user rgl
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559778
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic71aa095655e5a05c638a30dac197d05f960a8a9
2021-01-27 07:49:18 +00:00
Kevin Chyn
66cbc53de0
Remove unnecessary getAuthenticatorId
...
The framework already caches the authenticatorId upon user
switches and new enrollments. So, if the requested user is already
the current user, there should be no need to request the HAL for
the authenticatorId.
Bug: 178018968
Test: manual
Change-Id: I6965605b16a4334324c53ed110ca92c2cec46bad
2021-01-27 05:17:19 +00:00
Paul Hu
3739eed0ce
Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: 742ec924e8 am: 57084714d4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I12d09faf926b513cd4f3db21703a673f8bd832bf
2021-01-27 01:01:37 +00:00
Paul Hu
57084714d4
Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: 742ec924e8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bd4c977d13d2328cab480ca27c59de6fc4856a6
2021-01-27 00:33:36 +00:00
Treehugger Robot
a38be41f98
Merge "Keystore 2 SPI: Fix KeyStorePublicKey getEncoded()." am: 9e5385798e am: 050882545c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559984
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70b6782600733ea9d35d422fb827eef373a0074c
2021-01-27 00:22:37 +00:00
Josh Gao
629791842e
Merge "Thread.sleep takes milliseconds, not seconds." am: b79bd2867f am: 81830b2d5f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560108
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31534b93bdf67d8f6bfcb6839644157d25c1d100
2021-01-27 00:22:16 +00:00
Paul Hu
742ec924e8
Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()""
2021-01-27 00:04:09 +00:00
Treehugger Robot
050882545c
Merge "Keystore 2 SPI: Fix KeyStorePublicKey getEncoded()." am: 9e5385798e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559984
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0facd7c3f068f3923887b0484442e09712ef360
2021-01-27 00:01:48 +00:00
Josh Gao
81830b2d5f
Merge "Thread.sleep takes milliseconds, not seconds." am: b79bd2867f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560108
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a3d67346b44782a6afc61c062336adeb39ff06e
2021-01-26 23:51:26 +00:00
Treehugger Robot
9e5385798e
Merge "Keystore 2 SPI: Fix KeyStorePublicKey getEncoded()."
2021-01-26 23:45:52 +00:00
Josh Gao
b79bd2867f
Merge "Thread.sleep takes milliseconds, not seconds."
2021-01-26 23:36:05 +00:00
TreeHugger Robot
77bb0b7291
Merge "ActivityManagerService: all users can handle freezer state in debug builds" into rvc-qpr-dev am: 595e3ee3c0 am: 2c23216d49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13408289
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3cb960fd0d8614dbe9dca5549058a895c227d5c
2021-01-26 23:27:57 +00:00
Christine Franks
e8f6e92fe0
Merge "Add configurable mapping between color modes"
2021-01-26 23:16:12 +00:00
Hall Liu
bd4e78b072
Merge "Correct name of roaming RTT config" am: b6622aeeb6 am: a083efc121
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560151
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5565934a33c55dfaec1e2cf2f1192ae41f97ddb5
2021-01-26 23:11:09 +00:00
Treehugger Robot
1438f59fb0
Merge "Add app hibernation service stubs" am: d7bac025fb am: d131f3737d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1544924
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44b19930ec127d096ac8f25da8e60302c02053b9
2021-01-26 23:10:54 +00:00
Treehugger Robot
551931360b
Merge "Add enforcement parameter to RequiresFeature" am: dd438b73cc am: 371eea87de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560535
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I329a81911fd5a186e48a3aab8dab36b79f4515ec
2021-01-26 23:10:40 +00:00
Treehugger Robot
f33a10bffd
Merge "Set OWNERS for core/java/android/app/VoiceInteractor" am: ad1dde5594 am: c0f1148dc6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557029
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb57b407a859b33399d3624ad2ab1bb80f40e30c
2021-01-26 23:10:25 +00:00
Treehugger Robot
ab95b3352a
Merge "Add visibility for new location of permission apex." am: 3525be2175 am: e1c8e59876
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560528
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6836b4f7a4e4b11ec96781432eb44ed43f01217
2021-01-26 23:10:13 +00:00
Treehugger Robot
916c13d45a
Merge "Add toddke to owners for system server" am: 4ddafbf58f am: 7a2d9d0613
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559283
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If95ea91a5f2a0003449796b64a5b491c960573b6
2021-01-26 23:10:04 +00:00
Treehugger Robot
1cc5b4ca0c
Merge "CEC : Add test to check ARC status" am: 2338a4df6b am: a2e9b7cd63
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic27b9e334b5e76b1bb19f65a78e0e3d7946415c2
2021-01-26 23:09:53 +00:00
Treehugger Robot
e364dc06c4
Merge "Change order of owners." am: 0d72e983ce am: 81ff12d6c1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556131
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibae68c02d08e220852526e2ad5f89b84c9e85f78
2021-01-26 23:09:17 +00:00
David Zeuthen
581bf34de0
Merge "Identity Credential: API changes for Android 12" am: 40d6635701 am: 6252f82f61
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1464362
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3405bbcbcd6deb35ea4cfeb03792b7ef793ac9f
2021-01-26 23:08:55 +00:00
Treehugger Robot
2d6430198c
Merge changes I713bc2ec,Ib9ab07c9 am: 3795a7d1d2 am: d8b7ab2076
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31e71444d5b40981058b5a4152e5f1a0521527d0
2021-01-26 23:08:40 +00:00