Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
620,808 Commits 3 Branches 0 Tags
88b454286dfd8679316254387bb62a09457ad582
Commit Graph

620808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Lucas Dupin
0c38b48c3f Merge "Fix staus bar colors when shade is down" 2021-01-26 23:01:24 +00:00
Matt Pietal
dcd581fdc1 Merge "Controls - Fix PendingIntent" 2021-01-26 22:51:50 +00:00
Christian Frank
2f3428ec0f Merge "Change MANAGE_MUSIC_RECOGNITION permission to signature|privileged." 2021-01-26 22:49:00 +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
Darryl Johnson
2449f0e170 Merge "Ensure DeviceStateProviderImpl considers first state before others." 2021-01-26 22:13:45 +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
Rob Carr
26832720da [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 am: d1874fe870 -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: I66a5f7cce8c1a3d4ff9b700988bd0a04ae6651d0
 2021-01-26 21:40:42 +00:00
Rob Carr
1e06db458e [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 am: 91b0140cca -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic58b469c9a2cf7f6311ae73a1bfb38de2d8bcc1f
 2021-01-26 21:40:24 +00:00
Rob Carr
f1c7b25c74 [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 am: b132ec6a23 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6149d98a9a0ec82e49df72dd767dfa9fff86166b
 2021-01-26 21:40:03 +00:00
Robert Carr
ef62ebd6f4 [automerger skipped] DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL. am: 514b329776 am: f5aa61a735 -s ours am: 027e0beec5 am: 73db664c90 am: 32714c9963 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b7c8ec3b25074602e1ebd1de79d71f899286fdd
 2021-01-26 21:39:46 +00:00
Rob Carr
f99f79a0a6 [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 am: b65482bbea -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211149

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieed0fa6d2ef8bcf2229cd841c9086882978fdd7d
 2021-01-26 21:39:06 +00:00