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

620827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ahaan Ugale
5c538f8163 Merge "VoiceInteraction: Add TEST_MAPPINGs." 2021-01-26 21:03:00 +00:00
TreeHugger Robot
3cb20493af Merge "Hide AOD/LS layout changes" 2021-01-26 21:02:24 +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
Lucas Dupin
1530f11758 Fix staus bar colors when shade is down 
Colors should be pulled from textColorPrimary, given that that's the
color that contrast against the new scrim.

Bug: 177907834
Test: visual
Change-Id: Ic78ab99d414ad3a364250fa8468be7bad630bc5e
 2021-01-26 12:40:19 -08:00
Rob Carr
08d66983df [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: aad0ef5fff -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: I813b79b5515c096cd15a087713ccad96969daadb
 2021-01-26 20:38:47 +00:00
Rob Carr
be51656135 [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: 7153136e74 -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: Ic06a9afa0c6eea8bd316234b059bb6ff299a1268
 2021-01-26 20:38:26 +00:00
Rob Carr
3195289738 [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: b7802cf79e -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: I5144bed0b8f27656f8af1d71f136ae5d851970b4
 2021-01-26 20:37:47 +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
Robert Carr
22a8a7db8c [automerger skipped] DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL. am: 514b329776 am: f5aa61a735 -s ours am: 027e0beec5 am: e95f39b077 -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: I9513f833032a1a09b6df4081fae8fb54cafe43bf
 2021-01-26 20:37:23 +00:00
Rob Carr
a0035590aa [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: fa7eadf02e -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: I1389917717d514a503ab32cb4f38b9b59eddb443
 2021-01-26 20:36:59 +00:00
TreeHugger Robot
5e2ea0f7a2 Merge "Enabling Launcher to directly create input monitor" 2021-01-26 20:35:57 +00:00
Matt Pietal
1866f01ccb Controls - Fix PendingIntent 
Add FLAG_IMMUTABLE!

Fixes: 178428673
Test: manual, launch activity from controls
Change-Id: Id81f859373ba96e8ec82f53085086d3a889849a3
 2021-01-26 15:22:06 -05:00
TreeHugger Robot
f4e7856ce9 Merge "Lazily loading the widget providers to avoid loading app-resources on userUnlock" 2021-01-26 20:19:53 +00:00
Rob Carr
aad0ef5fff [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: If385d245cf97b062737933fa97d5c1cd1c819164
 2021-01-26 20:18:48 +00:00
Rob Carr
7153136e74 [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: I2ead89e690db264ab1af5c8db23dc0668bab7dad
 2021-01-26 20:18:38 +00:00
Rob Carr
b7802cf79e [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: I6e7023cde5fae17585bcc6b2d883c2c78cd09fa2
 2021-01-26 20:18:29 +00:00
Robert Carr
e95f39b077 [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: Id4a5136a8fcdb8c65a43a9923db324ebe641f71f
 2021-01-26 20:18:28 +00:00
Rob Carr
fa7eadf02e [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: I4d06374bf40ead72b436c6b549e082f93f322195
 2021-01-26 20:18:17 +00: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
Christine Franks
b776313816 Add configurable mapping between color modes 
There are two categories of color modes: the standard color modes, which
are defined and implemented in AOSP, and a reserved range of vendor color
modes, which are defined and implemented by the vendor. Currently, there
is no way to distinguish between two vendor's color modes that use the
same value within the reserved range. This will allow OEMs to specify a
hint as to which vendor's color mode definitions were used on the
original device. If the hint from the restored device matches the hint
on the new device, the color mode from the restored device can still be
considered valid for the new device if it is within the vendor reserved
range. If it does not match, the restored device's color mode value is
invalid on the new device, and must be replaced by the default on the
new device.

Bug: 167449433
Test: builds
Change-Id: Ie5ac0a2d783e1ea703e0342f5cdb41dca07d04d4
 2021-01-26 12:12:32 -08: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
Rob Carr
b8e01656c0 [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 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: Ie40d88988fbbf7f246820d519e13227f7793168b
 2021-01-26 20:06:10 +00:00
Rob Carr
d3eb04e729 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cb556ca775bbfbe4346eab371a1cc5b77acac31
 2021-01-26 20:05:45 +00:00
Rob Carr
bc0cd4a148 [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 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: I9be06dd024415698db9252f9e7badadaddb4f587
 2021-01-26 20:05:36 +00:00