Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
751,234 Commits 3 Branches 0 Tags
54f85531d82d962efab579e56cbcd5efe6720ccc
Commit Graph

751234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryce Lee
54f85531d8 Merge "Remove communal support from SystemUI." into tm-dev am: 836db75e0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17069901

Change-Id: I13e77b818ea96a8551a7667cbb0e6e4d7f791f23
 2022-03-04 23:20:26 +00:00
Winson Chiu
0a687772dc Merge "AAPT2: support removed_ entries in groups" into tm-dev am: 2222f486b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17085903

Change-Id: I46cbbf68424c896ff72643db962f916667df9653
 2022-03-04 23:19:21 +00:00
Bryce Lee
836db75e0f Merge "Remove communal support from SystemUI." into tm-dev 2022-03-04 22:50:50 +00:00
Winson Chiu
2222f486b2 Merge "AAPT2: support removed_ entries in groups" into tm-dev 2022-03-04 22:48:41 +00:00
TreeHugger Robot
ac395b8a5c [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 306a4f429a -s ours am: 2c39d9f723 -s ours am: 3208bd64e6 -s ours am: 5302762a22 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: I8ae02a06b83d57bd13085fe90f60df31eaa52ea9
 2022-03-04 22:15:11 +00:00
TreeHugger Robot
6a6132db5d [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6eb -s ours am: e6f05647a4 -s ours am: b6f75ad032 -s ours am: 4900eace9c -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I9a9fe130d9380d36f5bdc2ba5ac22cfd88c9f292
 2022-03-04 22:15:04 +00:00
Presubmit Automerger Backend
93e16192b0 [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829 am: 24bedd152e -s ours am: b6785cc69b -s ours am: 2646e5f055 -s ours am: 71c381f4f9 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I53d2a833843555c5c02c4145183cf65f26ad2b1f
 2022-03-04 22:14:58 +00:00
Eric Biggers
d8596df6a3 Merge "Remove broken code for mounting encrypted OBB files" am: a4f24f08b0 am: 56c37e5778 am: 089a351d31 am: 4fb38d5fc3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003052

Change-Id: Ia888aa400535d2422b25e41576c10211c59db9ca
 2022-03-04 22:14:15 +00:00
Xiaowen Lei
7e0016c139 Merge "Fix [AndroidFrameworkRequiresPermission] build warnings for add(remove)KeyguardLockedStateListener." into tm-dev am: 788fe7cdb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061596

Change-Id: Ib55513ded11740d2a849b14d9f653aed3a018bb8
 2022-03-04 22:13:47 +00:00
TreeHugger Robot
5302762a22 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 306a4f429a -s ours am: 2c39d9f723 -s ours am: 3208bd64e6 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: I29a676b5765db32103b143c52fa7eb8ef44369a0
 2022-03-04 22:12:45 +00:00
TreeHugger Robot
4900eace9c [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6eb -s ours am: e6f05647a4 -s ours am: b6f75ad032 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: If58226e72280f452700c55754a0fba7f7686996e
 2022-03-04 22:12:29 +00:00
Xiaowen Lei
fc84fccd49 Merge "Add SharedPreferences keys for the nudge to setup dream." into tm-dev am: 94184ccae9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061170

Change-Id: I8a08f67731551ca5c6384248a7d999f716b7d6f2
 2022-03-04 22:12:19 +00:00
Presubmit Automerger Backend
71c381f4f9 [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829 am: 24bedd152e -s ours am: b6785cc69b -s ours am: 2646e5f055 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I0d8dea3d2f35d5a3f4a6af5082875a69ff665df3
 2022-03-04 22:12:17 +00:00
TreeHugger Robot
3208bd64e6 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 306a4f429a -s ours am: 2c39d9f723 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: I97f08a777ff6855ec16668e8d76b5a38a1f77b3e
 2022-03-04 22:11:57 +00:00
Eric Biggers
4fb38d5fc3 Merge "Remove broken code for mounting encrypted OBB files" am: a4f24f08b0 am: 56c37e5778 am: 089a351d31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003052

Change-Id: I87cbb67af5e1dc62ddbb8ff7d58a256ee4569b44
 2022-03-04 22:11:49 +00:00
TreeHugger Robot
b6f75ad032 [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6eb -s ours am: e6f05647a4 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I1965542abd5e922360de52c2019bfc623161121e
 2022-03-04 22:11:38 +00:00
Presubmit Automerger Backend
2646e5f055 [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829 am: 24bedd152e -s ours am: b6785cc69b -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I37861b22fdb553585b8a800fde6e0e5bec849494
 2022-03-04 22:11:18 +00:00
Xiaowen Lei
788fe7cdb6 Merge "Fix [AndroidFrameworkRequiresPermission] build warnings for add(remove)KeyguardLockedStateListener." into tm-dev 2022-03-04 22:04:52 +00:00
Xiaowen Lei
94184ccae9 Merge "Add SharedPreferences keys for the nudge to setup dream." into tm-dev 2022-03-04 22:04:08 +00:00
TreeHugger Robot
cc63305a57 Merge "RemoteViews: don't crash on null display in getLaunchOptions" into tm-dev am: a5ab5d5836 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084405

Change-Id: I9bbccd3a3be6673845de8d164e8087dac8e299af
 2022-03-04 22:01:35 +00:00
TreeHugger Robot
2336bfdcfa [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 2b511619a5 -s ours am: cd1aea8ecb -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: I990adb4ddc596373f5c42efd2166b3082dcd8d23
 2022-03-04 22:01:28 +00:00
TreeHugger Robot
ee3fee5b43 [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-mainline-prod am: ac3dbb418a -s ours am: 0280801eea -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: Ied851ac63f447e80112b492e9ea915b04c470e2a
 2022-03-04 22:01:04 +00:00
TreeHugger Robot
a5ab5d5836 Merge "RemoteViews: don't crash on null display in getLaunchOptions" into tm-dev 2022-03-04 22:00:55 +00:00
TreeHugger Robot
cd1aea8ecb [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 2b511619a5 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: Id011914db2cb57b5d567ff6ca52b1e6fdd79d9eb
 2022-03-04 21:50:46 +00:00
TreeHugger Robot
2c39d9f723 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 306a4f429a -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: I6ff06b5186ce8371940d49b26e2197475c7e04cd
 2022-03-04 21:50:32 +00:00
Eric Biggers
089a351d31 Merge "Remove broken code for mounting encrypted OBB files" am: a4f24f08b0 am: 56c37e5778 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003052

Change-Id: I14ae3ace2717e7c09d06e509c51761285a3b84d0
 2022-03-04 21:50:29 +00:00
TreeHugger Robot
0280801eea [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-mainline-prod am: ac3dbb418a -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: Ieef79513ae4e8576ae216a7996f4559f1853c197
 2022-03-04 21:50:29 +00:00
TreeHugger Robot
306a4f429a [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: Ib51737df43161ac2a882efec5f5f8167adddd79e
 2022-03-04 21:50:23 +00:00
TreeHugger Robot
e6f05647a4 [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6eb -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I4700ae4041dffce2e9870dbc1faa7c7227c79067
 2022-03-04 21:50:22 +00:00
TreeHugger Robot
15ad68d6bd [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into tm-dev am: c4f898fb08 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: Ife6c0af829022385504acc0784be87fad7164706
 2022-03-04 21:50:21 +00:00
Matt Pietal
4eadd93684 [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829 2p: dde281c5e5 am: 03fb51324f -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I090347a4a518304fc8a6095ad35cd7568f22e012
 2022-03-04 21:50:20 +00:00
Presubmit Automerger Backend
b6785cc69b [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829 am: 24bedd152e -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I2cee7e631b01781641c675b460f637109d3db824
 2022-03-04 21:50:14 +00:00
TreeHugger Robot
273e7d1bb3 Merge "Add stable tests back to presubmit" into tm-dev am: 9bb218a9c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005564

Change-Id: Ia66a3c9a24c9d333abe41112f1153262bca0a995
 2022-03-04 21:49:38 +00:00
TreeHugger Robot
2b511619a5 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: I36022f25296696f804eaa2a8e6b599441c142e53
 2022-03-04 21:49:36 +00:00
Winson Chiu
c84829d2d4 AAPT2: support removed_ entries in groups 
Ignores and increments the ID if the entry contains removed_, to prevent
shifting IDs by leaving a hole, allowing staging resources to be removed
before finalization.

This was broken out from the parent change to allow other CLs fixing the
resource IDs to be merged without splitting public.xml.

Bug: 222537368

Test: manual, see bug for other changes

Change-Id: I56f4fd70824bd42ec62f4fa0a2f067e2a3c094b5
 2022-03-04 21:36:27 +00:00
TreeHugger Robot
c4f898fb08 Merge changes from topic "mpietal_keyguard_priority-sc-dev" into tm-dev 
* changes:
  [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829 2p: dde281c5e5
  [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829
  Keyguard - Treat messsages to lock with priority
 2022-03-04 21:30:37 +00:00
TreeHugger Robot
ac3dbb418a Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-mainline-prod 
* changes:
  [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829
  Keyguard - Treat messsages to lock with priority
 2022-03-04 21:30:37 +00:00
TreeHugger Robot
333f01f6eb Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev 
* changes:
  [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829
  Keyguard - Treat messsages to lock with priority
 2022-03-04 21:30:37 +00:00
TreeHugger Robot
ca8eb0192c Merge "Keyguard - Treat messsages to lock with priority" into sc-dev 2022-03-04 21:30:37 +00:00
Eric Biggers
56c37e5778 Merge "Remove broken code for mounting encrypted OBB files" am: a4f24f08b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003052

Change-Id: Id027c555af21e46922a1c0ce29195d95bb7bb876
 2022-03-04 21:27:43 +00:00
TreeHugger Robot
9bb218a9c4 Merge "Add stable tests back to presubmit" into tm-dev 2022-03-04 21:22:22 +00:00
Eric Biggers
a4f24f08b0 Merge "Remove broken code for mounting encrypted OBB files" 2022-03-04 20:58:13 +00:00
TreeHugger Robot
f5e95841f9 Merge "Extend lifetime of notifs during activity launch" into tm-dev am: 89489bb5a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17017541

Change-Id: Id5fe0a1dc775cf869016ed1d9817d6cf9d05742f
 2022-03-04 20:55:31 +00:00
Treehugger Robot
69d1c8aa6e Merge "identity: Add clarifications to newly added API." am: ad3097312c am: e502cbe5db am: b8621b3097 am: da1715a6b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007310

Change-Id: I477ded2ced9cbd37695d994aaa39e79e58430327
 2022-03-04 20:55:23 +00:00
TreeHugger Robot
b11bd80c91 Merge "Cherry pick for contentAllowed bug fix" into tm-dev am: 345a6bf30a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071933

Change-Id: I07442f0003308bd0a7ecb1c059ff239863f979b4
 2022-03-04 20:54:42 +00:00
Mateusz Cicheński
04bb0050ff Merge "Add ShellProtoLogGroup for Picture-In-Picture. Update the code for PIP and phone PIP to use ProtoLog instead of Log." into tm-dev am: a61c47ff37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17060500

Change-Id: I12c4647204c17d8b748571204800695d52f5e3f5
 2022-03-04 20:53:43 +00:00
TreeHugger Robot
89489bb5a8 Merge "Extend lifetime of notifs during activity launch" into tm-dev 2022-03-04 20:43:23 +00:00
Treehugger Robot
da1715a6b5 Merge "identity: Add clarifications to newly added API." am: ad3097312c am: e502cbe5db am: b8621b3097 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007310

Change-Id: If3656d63600429ef32d881cfd52172bb78631575
 2022-03-04 20:42:04 +00:00
TreeHugger Robot
345a6bf30a Merge "Cherry pick for contentAllowed bug fix" into tm-dev 2022-03-04 20:31:33 +00:00
Mateusz Cicheński
a61c47ff37 Merge "Add ShellProtoLogGroup for Picture-In-Picture. Update the code for PIP and phone PIP to use ProtoLog instead of Log." into tm-dev 2022-03-04 20:29:17 +00:00