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
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
Josh Gao
b79bd2867f
Merge "Thread.sleep takes milliseconds, not seconds."
2021-01-26 23:36:05 +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
Andrei-Valentin Onea
e0f9b5217a
Merge "Improve flakiness of PlatformCompatGating test" am: d500b8afd6 am: 8fabad25ca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaaca84851e4085b979bd2d6a7566469a4ff367b5
2021-01-26 23:08:28 +00:00
Yo Chiang
d5c00788c5
Merge "Fix dynsystem.BootCompletedReceiver" am: cc0ece4108 am: 5d4aa4a1de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555905
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd3dfb14772f117797baaea053450bedad66db78
2021-01-26 23:08:18 +00:00
Yo Chiang
db4dc27684
Merge "Remove feature flag "settings_dynamic_system"" am: 7b84f49b41 am: 3048afdb0a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541210
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If301821ebc25b51135f26be7fc768b40bc71581e
2021-01-26 23:08:05 +00:00
Benedict Wong
257155acf1
Merge "Remove usage of NetworkInfo" am: bd65203feb am: bf0a284f4e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559684
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1187243a86db12c79f0942a0e0ffd926f8ec78e6
2021-01-26 23:07:32 +00:00
Rhed Jao
97bf010bc1
Merge "Deprecates GET_INTENT_FILTERS in the PackageManager" am: cba3b81738 am: a81e3c0ffc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473222
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4eff6716141761c27e9f6791bb4120a155ca544a
2021-01-26 23:07:16 +00:00
Chun-Wei Wang
b0538566e7
Merge "Pass the correct user id" am: 1d01d76048 am: 132f054eb2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic2d39c7c5ee17dacecf0edbf070f7bb98f469b7d
2021-01-26 23:06:44 +00:00
Yan Yan
e0662139e0
Merge "Expose IPsec tunnel APIs from @SystemApi to public APIs" am: 5b8a0c8d89 am: 67d7fde5ad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517517
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I395e7b7ba8c5e1752ad162b0428597587e425e3c
2021-01-26 23:06:22 +00:00
Jeff Sharkey
5694062005
Merge "Add owners for shortcut utils" am: f9095c3bc7 am: 22c5c6b246
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I597920a35ef71326a7e26219a7082336160637dd
2021-01-26 23:06:08 +00:00
Tianjie Xu
d6496b0d6b
Merge "Create the ResumeOnRebootService." am: edc7961287 am: 12b77e5e5b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia4c2af2483a986fcb13234bab8547950e0dd6b48
2021-01-26 23:04:55 +00:00
Hall Liu
a083efc121
Merge "Correct name of roaming RTT config" am: b6622aeeb6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560151
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If7ee0d6cab7fe781a05de2a87a86cf716d6e6a76
2021-01-26 23:03:50 +00:00
Hall Liu
7f159d477f
Merge "Allow carriers to configure RTT while roaming" am: 923d7d28d0 am: 36e819d95f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558908
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I43ecce89c03cb33969f489c082684d3c5c0e56a3
2021-01-26 23:03:30 +00:00
Benedict Wong
6a762e057a
Merge "Implement Disconnected state" am: 4f27883485 am: b66cdc3e87
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530784
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b2341f138d50aec6fd26f7312539f3314e3d907
2021-01-26 23:03:09 +00:00
Nikita Ioffe
0356d3a9a3
Merge "Fix for TestDirectBootEmulated testcase" am: 0bd1e20da8 am: e69cdcc689
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559104
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac803ff44f99afdca3481bd0d17f62c815dca3aa
2021-01-26 23:02:51 +00:00
Treehugger Robot
bdf7512708
Merge "Update OWNERS files for tests" am: ac64bae06d am: 5fc7bffd49
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559350
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I57c968a828a56fecb497cac5fc76df1ce225f5f5
2021-01-26 23:02:34 +00:00
Jeff Sharkey
c359bbe9a7
Merge "Update OWNERS for SigningDetailsTest" am: c934889c91 am: 6ddd93b80e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e134cc76b27f8559309e4629be00c8f02624828
2021-01-26 23:02:22 +00:00
Robin Lee
1437a142dc
Merge changes from topic "revert-1510032-atv-rro-ZVBUWAKVPO" am: 3d6736d0fd am: 8966a5dd89
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559778
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibfab465cbb08d4f34d6b174e1efd0606505c4154
2021-01-26 23:02:03 +00:00
Treehugger Robot
d131f3737d
Merge "Add app hibernation service stubs" am: d7bac025fb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1544924
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1845d739853aede368ff130d54c88925ea545f50
2021-01-26 22:56:14 +00:00
Treehugger Robot
371eea87de
Merge "Add enforcement parameter to RequiresFeature" am: dd438b73cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560535
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1dd3455a808aa2373270295ffbd9a01f1b4a1845
2021-01-26 22:27:56 +00:00
Hall Liu
b6622aeeb6
Merge "Correct name of roaming RTT config"
2021-01-26 22:26:56 +00:00
TreeHugger Robot
2c23216d49
Merge "ActivityManagerService: all users can handle freezer state in debug builds" into rvc-qpr-dev am: 595e3ee3c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13408289
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb3eb9683278717e14451f286b4d715ca6e6b2c7
2021-01-26 22:25:33 +00:00
Treehugger Robot
d7bac025fb
Merge "Add app hibernation service stubs"
2021-01-26 22:23:13 +00:00
Treehugger Robot
dd438b73cc
Merge "Add enforcement parameter to RequiresFeature"
2021-01-26 22:03:53 +00:00
TreeHugger Robot
595e3ee3c0
Merge "ActivityManagerService: all users can handle freezer state in debug builds" into rvc-qpr-dev
2021-01-26 22:02:25 +00:00
Treehugger Robot
c0f1148dc6
Merge "Set OWNERS for core/java/android/app/VoiceInteractor" am: ad1dde5594
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557029
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7555bf00689b0cce6f5017492118c7ac935b70cb
2021-01-26 20:47:31 +00:00
Rob Carr
d1874fe870
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours am: aa682dec92 -s ours am: a22cfe0b46 am: d3eb04e729 -s ours am: 03ca6d9014 am: 2092b189c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2bcdaa459c5d6b3e75312ac9f8183208f0ace9d2
2021-01-26 20:45:51 +00:00
Rob Carr
91b0140cca
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df18e -s ours am: bbd4d45090 am: 74f95bbb51 -s ours am: b8e01656c0 am: 8935ee5f8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206662
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If7eceeefd8a4eb8541b7b61e3db7bec1593576c3
2021-01-26 20:45:16 +00:00
Rob Carr
b132ec6a23
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-dev am: 525770f7e8 am: 9089b9f175 -s ours am: bc0cd4a148 am: 99dfe5fa7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6d7c5e928cdd60af64cee175664929238ff1ded6
2021-01-26 20:44:49 +00:00
Robert Carr
32714c9963
[automerger skipped] DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL. am: 514b329776 am: f5aa61a735 -s ours am: 027e0beec5 am: 73db664c90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3845dabb9ac469fb1974eede1c7ceb31a98ccf73
2021-01-26 20:44:11 +00:00
Rob Carr
b65482bbea
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-qpr1-dev am: 735a40b06b -s ours am: e058131d53 am: 86b6c9fba9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb06c791eb5949b60a7dab93c8d73de7a51a45ce
2021-01-26 20:37:32 +00:00
Treehugger Robot
ad1dde5594
Merge "Set OWNERS for core/java/android/app/VoiceInteractor"
2021-01-26 20:24:04 +00:00
Daniel Bright
109454a1f9
Add enforcement parameter to RequiresFeature
...
* Allows for a broader range of enforcement checks
* Designed to match androix so that it can be easily slotted into
Android Studio lint checks
Test: Built
Bug: 173735303
Change-Id: Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845
Merged-In: Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845
2021-01-26 12:20:32 -08:00
Rob Carr
2092b189c6
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours am: aa682dec92 -s ours am: a22cfe0b46 am: d3eb04e729 -s ours am: 03ca6d9014
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35f436a7604cc258e0b9eb920d0b32bf6164d14b
2021-01-26 20:17:38 +00:00
Rob Carr
8935ee5f8f
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df18e -s ours am: bbd4d45090 am: 74f95bbb51 -s ours am: b8e01656c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206662
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica9a04b9b2827794c49f5d1a5866da17a3681215
2021-01-26 20:17:30 +00:00
Rob Carr
99dfe5fa7c
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-dev am: 525770f7e8 am: 9089b9f175 -s ours am: bc0cd4a148
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4f93c32aea4ebca63fbdfe261b35e5433754809
2021-01-26 20:17:20 +00:00
Robert Carr
73db664c90
[automerger skipped] DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL. am: 514b329776 am: f5aa61a735 -s ours am: 027e0beec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I62598614ef8a482f6f200a3651b4cd777583506d
2021-01-26 20:17:12 +00:00
Rob Carr
86b6c9fba9
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-qpr1-dev am: 735a40b06b -s ours am: e058131d53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If5106411587a22d9bf0d3bb13e0c8ba3fcf7b272
2021-01-26 20:16:52 +00:00
Rob Carr
03ca6d9014
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours am: aa682dec92 -s ours am: a22cfe0b46 am: d3eb04e729 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8bbdf308d354d716f4e4e8349cd4eed3cff4cb9a
2021-01-26 20:06:23 +00:00
