Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
760,899 Commits 3 Branches 0 Tags
6e5bd053ecdfd8eb23d4c5e0e89779b1c64eb60e
Commit Graph

760899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
6e5bd053ec Merge "Merge "Add role protection level to MODIFY_QUIET_MODE" into tm-dev am: 6563740430 am: 64e2895add" 2022-03-24 00:52:09 +00:00
Automerger Merge Worker
121e0df874 Merge "Merge "User Switcher: Polish tap on user switcher." into tm-dev am: c7ce201c2c" 2022-03-24 00:51:50 +00:00
Alex Johnston
9ac6d765d1 Merge "Add role protection level to MODIFY_QUIET_MODE" into tm-dev am: 6563740430 am: 64e2895add 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220109

Change-Id: I2a67f7698492d56184835260e32a3092a57af0d7
 2022-03-24 00:51:47 +00:00
Automerger Merge Worker
878e910735 Merge "Merge "Fix an issue where stack education and the stack weren't aligned" into tm-dev am: 4db1adb65e am: 14a8e9a3e3" 2022-03-24 00:51:37 +00:00
Aaron Liu
df9720d3ab Merge "User Switcher: Polish tap on user switcher." into tm-dev am: c7ce201c2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17298455

Change-Id: I69c74798d4390c5d30cc9a65ff6b20cba2cebc84
 2022-03-24 00:51:29 +00:00
Mady Mellor
8ae58efa23 Merge "Fix an issue where stack education and the stack weren't aligned" into tm-dev am: 4db1adb65e am: 14a8e9a3e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326809

Change-Id: I4cc4955e88ca27b6200ff7a32b4d1c0622687bcf
 2022-03-24 00:51:07 +00:00
TreeHugger Robot
9f9fbb846d [automerger skipped] Merge "Fix ServiceConnector failing unbind if not connected." into sc-v2-dev am: cbb04a4286 -s ours am: 076a758f5d -s ours am: 329ed6ef8e -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 efc50877d2 is already in history

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

Change-Id: Ide4b4a190c55d963f5a05c0d3be055d6bd419e8f
 2022-03-24 00:51:05 +00:00
Automerger Merge Worker
6deef53647 Merge changes from topic "am-5de743b640c4436eb27171a969fde82c" 
* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp am: d53d398625 -s ours am: 8572affd55 -s ours
  [automerger skipped] [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2 am: 34f0951f96 -s ours am: 2f137b638f -s ours
 2022-03-24 00:50:59 +00:00
TreeHugger Robot
e8760c36d4 [automerger skipped] Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp am: d53d398625 -s ours am: 8572affd55 -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 52e0dafcb3 is already in history

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

Change-Id: I3d6c10ccd2f890a99c54f1817e660ceade0bfce8
 2022-03-24 00:50:21 +00:00
Mady Mellor
5e52790f2b Merge "Adjust the sizes of user education for large screens / landscape" into tm-dev am: 139a3c1803 am: 7691917579 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326808

Change-Id: I80b5dcff1145e4f1e2484b4d0a18b6668a40e312
 2022-03-24 00:50:14 +00:00
Automerger Merge Worker
2297633978 Merge "Merge changes from topic "presubmit-am-fd9c10e17ae94cf5b5b47b78cd7c56b3" into tm-dev am: 04b5ad3c49 am: 9684520e8c" 2022-03-24 00:49:59 +00:00
Presubmit Automerger Backend
1fcec65502 [automerger skipped] [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2 am: 34f0951f96 -s ours am: 2f137b638f -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 52e0dafcb3 is already in history

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

Change-Id: I4a4dc207abd16f547df390a8204c2d9ab05d92dc
 2022-03-24 00:49:46 +00:00
Kohsuke Yatoh
64481758de Merge changes from topic "presubmit-am-fd9c10e17ae94cf5b5b47b78cd7c56b3" into tm-dev am: 04b5ad3c49 am: 9684520e8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17314948

Change-Id: I86653f467f6407610c02a7ebf2a675fa75c8e148
 2022-03-24 00:49:27 +00:00
Lais Andrade
55b9467f70 Merge "Fix PIN lock pattern not respecting user settings" into tm-dev am: 352d8d7abe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320107

Change-Id: I9d6b5ec4c40c9bb7a201d7b5acda1d56b9a9d8f2
 2022-03-24 00:49:15 +00:00
Automerger Merge Worker
85a2dfa587 Merge "Merge "Add role protection level to MODIFY_QUIET_MODE" into tm-dev am: 6563740430" 2022-03-24 00:49:03 +00:00
Alex Johnston
489d1e3b1d Merge "Add role protection level to MODIFY_QUIET_MODE" into tm-dev am: 6563740430 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17220109

Change-Id: I92f545ec58d5c0ce08475e5b93cceda278e98b9f
 2022-03-24 00:48:21 +00:00
Shaun Corkran
f200bfc30f Merge "Add CrossTaskNavigations API to restrict navigation from current task" into tm-dev am: a4889a2180 am: fcd049242b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17161301

Change-Id: Ic4f70fc28af2530b17ccec73b20035f4ad25899d
 2022-03-24 00:48:18 +00:00
Nataniel Borges
9de0be368b Merge "Allow LaunchBubble app to be launcher from launcher" into tm-dev am: e08000c02d am: fe5a8ca2b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002569

Change-Id: I8104c49448a597d2d1fa372b503b5b582b62a0ed
 2022-03-24 00:47:22 +00:00
Automerger Merge Worker
6ebb000d01 Merge "Merge "Introduce updateVisibility and updateLayout" into tm-dev am: 0797d97536 am: 34df5ce8f9" 2022-03-24 00:47:13 +00:00
Tiger Huang
df625416a3 Merge "Introduce updateVisibility and updateLayout" into tm-dev am: 0797d97536 am: 34df5ce8f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17292204

Change-Id: Idcc57b8de399c7db6ff44c160f48a76d48ac48a6
 2022-03-24 00:46:48 +00:00
Mady Mellor
fded87922f Merge "Fix an issue where stack education and the stack weren't aligned" into tm-dev am: 4db1adb65e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326809

Change-Id: I752007f3e853bea65a5dcee9566c6cdfdec309e7
 2022-03-24 00:46:44 +00:00
Automerger Merge Worker
310a0e75c9 Merge "Merge "Remove unneeded notif vis checks" into tm-dev am: c8a32ef1f8 am: aa470fd094" 2022-03-24 00:46:39 +00:00
Steve Elliott
6fbbd41c5a Merge "Remove unneeded notif vis checks" into tm-dev am: c8a32ef1f8 am: aa470fd094 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17350683

Change-Id: If27eba11a34bb5ace34c4091b2eb2406911244f6
 2022-03-24 00:46:16 +00:00
Mady Mellor
759ba075e8 Merge "Adjust the sizes of user education for large screens / landscape" into tm-dev am: 139a3c1803 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326808

Change-Id: I100bc4057a4b306114e96cc4a47ca409d0435849
 2022-03-24 00:46:04 +00:00
Automerger Merge Worker
a0ac888f61 Merge "Merge "Get device owner app admin" into tm-dev am: 2844eaf9f7 am: a4111f5311" 2022-03-24 00:45:55 +00:00
Kohsuke Yatoh
5288997441 Merge changes from topic "presubmit-am-fd9c10e17ae94cf5b5b47b78cd7c56b3" into tm-dev am: 04b5ad3c49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17314948

Change-Id: Ib409db137999731bd734d574622dc4f4dc9b9716
 2022-03-24 00:45:31 +00:00
Sooraj Sasindran
d3254a6dce Merge "Get device owner app admin" into tm-dev am: 2844eaf9f7 am: a4111f5311 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17323775

Change-Id: I0c851606721ac69cb7b7d108a410fc88006a7ba8
 2022-03-24 00:45:31 +00:00
Automerger Merge Worker
f824b9ea2f Merge "Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 am: 2e64dda571 am: 289609bdb3 am: 7128e88488 am: fa150bbc63" 2022-03-24 00:45:19 +00:00
John Wu
0ddd93ff98 Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 am: 2e64dda571 am: 289609bdb3 am: 7128e88488 am: fa150bbc63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2017095

Change-Id: I7b93e13e01477c3ec849d14a0c329f82a62fc8c7
 2022-03-24 00:44:49 +00:00
Shaun Corkran
a96ed781bc Merge "Add CrossTaskNavigations API to restrict navigation from current task" into tm-dev am: a4889a2180 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17161301

Change-Id: I4728b9bacfef7b331d0db3e47158df454e2a708b
 2022-03-24 00:44:33 +00:00
Automerger Merge Worker
733007e1bd Merge "Merge "Asynchronously bind/unbind service" into tm-dev am: f4dbcd621f am: f3e68d9a71" 2022-03-24 00:44:27 +00:00
Automerger Merge Worker
f4811325ec Merge "Merge "Allow LaunchBubble app to be launcher from launcher" into tm-dev am: e08000c02d" 2022-03-24 00:44:16 +00:00
Lucas Dupin
096c41b9a7 Merge "Asynchronously bind/unbind service" into tm-dev am: f4dbcd621f am: f3e68d9a71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17188342

Change-Id: I746df5627124a49c4659a85b74dc3938100a9ae4
 2022-03-24 00:43:54 +00:00
Automerger Merge Worker
f43f780ead Merge "Merge "Protect CAN_INTERACT_ACROSS_PROFILES_CHANGED broadcast." into tm-dev am: cb2985a2ae am: 28c62951e8" 2022-03-24 00:43:43 +00:00
Nataniel Borges
3594672a2c Merge "Allow LaunchBubble app to be launcher from launcher" into tm-dev am: e08000c02d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002569

Change-Id: Id675bd50206e97fc2d673d613f05b5d86780566d
 2022-03-24 00:43:35 +00:00
Automerger Merge Worker
a1c761e413 Merge "Merge "Introduce updateVisibility and updateLayout" into tm-dev am: 0797d97536" 2022-03-24 00:43:22 +00:00
Elis Elliott
eece85141d Merge "Protect CAN_INTERACT_ACROSS_PROFILES_CHANGED broadcast." into tm-dev am: cb2985a2ae am: 28c62951e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17135164

Change-Id: I78983d013a90e602ab9b5f2b22a6a8a533326a5d
 2022-03-24 00:43:01 +00:00
Automerger Merge Worker
9d0a314d27 Merge "Merge "Check for null callback" into tm-dev am: 1ffa981ea5 am: 71fdd608c3" 2022-03-24 00:42:48 +00:00
Tiger Huang
2c45fb8608 Merge "Introduce updateVisibility and updateLayout" into tm-dev am: 0797d97536 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17292204

Change-Id: Ia7f267a328fe65e7adc3390c8a6bc88ab87d48dd
 2022-03-24 00:42:35 +00:00
Automerger Merge Worker
a8f7b738e6 Merge "Merge "Remove unneeded notif vis checks" into tm-dev am: c8a32ef1f8" 2022-03-24 00:42:24 +00:00
Ytai Ben-tsvi
0b8648b453 Merge "Check for null callback" into tm-dev am: 1ffa981ea5 am: 71fdd608c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17300633

Change-Id: Ibdfa290a64974729fcd82831d2fd131b26278e1b
 2022-03-24 00:42:23 +00:00
Automerger Merge Worker
d439ddf258 Merge "Merge "Store initial bouncer showing state." into tm-dev am: 8a4163d495 am: d370f3b355" 2022-03-24 00:42:15 +00:00
Steve Elliott
8352616bc5 Merge "Remove unneeded notif vis checks" into tm-dev am: c8a32ef1f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17350683

Change-Id: I942c28aabd4a4f39edc8355f02e5fcd7c525f3ae
 2022-03-24 00:42:00 +00:00
Automerger Merge Worker
30c0344a41 Merge "Merge "Get device owner app admin" into tm-dev am: 2844eaf9f7" 2022-03-24 00:41:48 +00:00
Bryce Lee
28f8ecef7e Merge "Store initial bouncer showing state." into tm-dev am: 8a4163d495 am: d370f3b355 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17128838

Change-Id: Ie21ca1f531c50bc66d2590d2dd2374b2ed4cb5e1
 2022-03-24 00:41:38 +00:00
Sooraj Sasindran
262bf31ab7 Merge "Get device owner app admin" into tm-dev am: 2844eaf9f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17323775

Change-Id: I1c51d966d766b6d3926618631d29f9d0949f646a
 2022-03-24 00:40:58 +00:00
Robert Wu
b329d300e6 Merge "BluetoothMidi: Remove unsafe code" into tm-dev am: 2bea42c4bd am: 88ce6d7ae7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17161596

Change-Id: I81b282595238d8ae3f55058e08b75757af547fba
 2022-03-24 00:40:55 +00:00
Automerger Merge Worker
303e266bee Merge "Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 am: 2e64dda571 am: 289609bdb3 am: 7128e88488" 2022-03-24 00:40:46 +00:00
John Wu
7b9354bfeb Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 am: 2e64dda571 am: 289609bdb3 am: 7128e88488 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2017095

Change-Id: Ibf7a7d017c848ee455629c19caf397af51f1f7a4
 2022-03-24 00:40:18 +00:00
Caitlin Cassidy
9e29506db5 Merge "[Media TTT] Update the test adb commands to be able to see the default icon on the sender chip (used for a11y testing)." into tm-dev am: fd5d2c2826 am: 17021c6645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17293233

Change-Id: Ic5f79beb3de3254aaf3064f6fc72d95101e32adf
 2022-03-24 00:40:12 +00:00