Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
766,431 Commits 3 Branches 0 Tags
52dc0ae546977bfcf7bd0f260b57d3a6799afa79
Commit Graph

766431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
52dc0ae546 Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 am: 775b8e222c am: 74a2671cf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125637

Change-Id: I01662e482259d701f4a4cf553b008db57aa29549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:47:29 +00:00
Mateusz Cicheński
001680d13d Merge "Add a description to the params of keep clear rects APIs." into tm-dev am: f829b1332f am: 6c19b582f1 am: e969bf7d7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17772404

Change-Id: I2504f912d0682ae3ee02f557e0e55c9445c9e47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:47:15 +00:00
TreeHugger Robot
7004516214 Merge "[AppsFilter] separate classes for read and write" into tm-dev am: 4c71401de5 am: 0539d49aa9 am: d4e8f73d24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17921589

Change-Id: I7f77671f03f0c64f1969d7113d8f5c39982896a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:47:03 +00:00
Peiyong Lin
5e2ad6f958 Merge "Remove NavigationBarOverlayController." into tm-dev am: e26bcbb811 am: 687738c362 am: 3d14fd386f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083703

Change-Id: Idecdcd5af2e583f1f3d7f849ce45c6f357fd40dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:46:49 +00:00
Miranda Kephart
58ca8a2b83 Merge "Add clipboard source to edit image intent" into tm-dev am: 0c44208351 am: d7cf4c909a am: f15f6f6cbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17144196

Change-Id: I6a5e5fc150a34747f388d85fea2e1f87dcd9b0f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:46:35 +00:00
Pavel Grafov
fe52a9f8de Merge changes from topics "presubmit-am-18cfee8fd4a246488709515ab35ce4dd", "presubmit-am-909842e21190489984382774e830cfd7" into tm-dev am: 9f4d4e7352 am: 20381a032b am: 5209043caf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730694

Change-Id: Ie97a8fa29fb213f13aca1f045dde6edbb6fb43eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:46:25 +00:00
Jackal Guo
cbce4bf55a [automerger skipped] Merge "Revert "Escape single quotes in aapt2"" into tm-dev am: d63cdb916d am: d16011d658 am: f1439835cf -s ours 
am skip reason: Merged-In I775b8a304e76a83934c36886c17cf23560914d21 with SHA-1 49956a73c1 is already in history

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

Change-Id: I5e8eed0f4f5c727e407e3a9b5060c7e8a9d8409b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:46:12 +00:00
Thomas Stuart
8845a57fac Merge "fix log spewing coming from Telecom#LogUtils" into tm-dev am: 424c6c1f13 am: fe7ddf3caf am: ef703aed4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18056443

Change-Id: Ibe46c59ae6fc547739a812738cff802d8c961c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:45:51 +00:00
Matt Pietal
e0689cb891 Merge "[DO NOT MERGE] Bouncer - Update selected item text color" into tm-dev am: f37b7bf3fa am: 6df528f078 am: 2ed12e6f26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030422

Change-Id: If4d3b3f75d678b9b4f247ec338c5d1595de3a13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:45:36 +00:00
Matt Pietal
278be35c59 [DO NOT MERGE] Bouncer - Update selected item text color am: 195baa1c93 am: 06db04703a am: 695cbeff0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030422

Change-Id: I0138de032bec6d6ef35e885e20f445e5d5d5e8eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:45:33 +00:00
Vadim Caen
8ab8879406 Merge "Add developer option for back animation DO NOT MERGE" into tm-dev am: 064b49a1a1 am: 3a6daba948 am: a92a047ea3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619727

Change-Id: I33375bb408b1b4a4b2f108975141741cc511ec66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:44:46 +00:00
Vadim Caen
1a0c60483c Add developer option for back animation DO NOT MERGE am: 94f506aa2a am: d67d675344 am: d6518e5a53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619727

Change-Id: I046226caae3ad0bff374d261211b94132c8247ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:44:39 +00:00
Vadim Caen
aa90344566 Merge "Update deprecation documentation for onBackPressed" into tm-dev am: 4f77430976 am: adb7c4631e am: 25f03fe925 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090442

Change-Id: Iabdd5f150c2e59e5dd2078db76676f79e409cbb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:44:02 +00:00
Chris Li
750ebd3464 Merge "Don't launch placeholder for bottom TaskFragment when waiting for top" into tm-dev am: d4011e0e2b am: 38dbe45b22 am: c924a21b10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983784

Change-Id: Iaa15d009b286ea6eee2d4a82d3c412e6e6104885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:43:50 +00:00
Eric Laurent
ea1e0a4c92 Merge "audio: fix accessibility routing in call" into tm-dev am: 11e5671297 am: 8d9a1edbf1 am: 90c3766eea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17941425

Change-Id: I49ec96db76cdee59c20fd38695532a40a2f68686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:43:39 +00:00
Shaowei Shen
1d9fd5ad5a Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement" into tm-dev am: 8292f122d8 am: 417ceeb147 am: 692333bfe8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983949

Change-Id: Ice14e666244cec684c932a5d1cec1df50ea310e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:43:26 +00:00
shaoweishen
4e4c0610b4 DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement am: 73706ceebf am: 592631dfd1 am: e797f7be1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983949

Change-Id: Ib8f6c819b4de1e584d5cc87cf22c219c9780549f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:43:22 +00:00
Shaowei Shen
809da4ad44 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected" into tm-dev am: abe29d7362 am: c60c54dea3 am: 16065cbe1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17859795

Change-Id: I32b113c8bc3c639337e37ab56e27b29e2bdc1a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:43:06 +00:00
shaoweishen
3bc8ab18a4 DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected am: de900861e9 am: 7df087c3d7 am: 807fc3a62e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17859795

Change-Id: Ibaf7c4c4ca0266ace48e0bdfaa772b8eef4734fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:43:04 +00:00
Beverly Tai
4af2ff8283 Merge "DO NOT MERGE Update active unlock triggers take #2" into tm-dev am: d9803be1a9 am: 526e0680dd am: 6acdf3f542 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18005049

Change-Id: Id6958bc4b7b51b18caf2a0f22db92ca5dfc61205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:42:49 +00:00
Beverly
d768cf4c19 DO NOT MERGE Update active unlock triggers take #2 am: fe7e9e9a6d am: 4c2b554658 am: f136101e14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18005049

Change-Id: I1319ad8d03b44592437a55ae279760ab89aa7f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:42:45 +00:00
Chris Li
8bac9521de Merge "Make sure empty TaskFragment notify organizer" into tm-dev am: 597b031cc5 am: 81eca7eafa am: c6d436c0ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18085612

Change-Id: I6a4571c4048164efc04bf482a056dfef64a32662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:42:31 +00:00
Lucas Silva
7e3ab73b4f Merge "Revert "Merge "Restore V2+ signature requirement for system apps" into tm-dev am: a347b6c2e6 am: 8aa6d20125"" into tm-qpr-dev am: 22e3806203 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18128504

Change-Id: Id98f99f553dd861301ac5207a16a1440287e4394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:42:19 +00:00
Christian Göllner
8a55a97a66 Merge "Move code in settingslib/devicestate into its own module" into tm-qpr-dev am: 31cee94c8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18120142

Change-Id: Icefb8ceb1429f4607bca703658514dd61ec54a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:41:55 +00:00
Wesley Wang
1c98e43263 Merge "Disable battery saver notification based on predicted time left" into tm-dev am: 1d1d37ca68 am: 7be141608b am: 7e05d5968b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17984002

Change-Id: Ib4fdd21362328b52ec7b91347a180a52f96661f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:41:45 +00:00
Justin Weir
e26137076e Merge "Ensure log buffers are dumped to file on uncaught exceptions" into tm-dev am: b41c2879b4 am: 844af86b3d am: 1ebcb179b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17915248

Change-Id: I9e17198f237a342ee5c3a2adb53856853ce975e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:41:30 +00:00
Nikita Ioffe
d4930ee042 [automerger skipped] Merge "apk-in-apex-cache 1/n: Fix isCacheUpToDate for apk-in-apex" into tm-dev am: 239f082d75 am: 1f7888885a am: a2c8ed757a -s ours 
am skip reason: Merged-In I8a0ab8952454652048076a26e81097b95991ae60 with SHA-1 2589a7e8f7 is already in history

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

Change-Id: I88930428dc6221ec2f1b14f5aaf1b58c8f68ad65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:41:18 +00:00
Jim Blackler
e094db4490 Merge "Loading boost: use the existing GAME_LOADING power mode, and deactivate it on a timer." into tm-dev am: 70853212e7 am: d01e773cc8 am: 9bc1411d36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17745929

Change-Id: I835d32a25843c078720f52d192383aab0a113dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:41:06 +00:00
Philip Quinn
bd3c613027 Merge "Revert "Un-obscure the Telephony phone account ID."" into tm-dev am: ec77a90abc am: ef98914fe0 am: 1185e831e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130643

Change-Id: Icaea0c9c7da5c40e55500ee02d426fceb4a07e83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:40:47 +00:00
Jernej Virag
64905c00e2 Merge "Trace Window relayout reasons" into tm-dev am: cfbbd755ff am: f80a3ee1a1 am: 8c5597aa23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090282

Change-Id: I49895425a2f858ce32d2c55ffceeeccfb6dd6099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:40:33 +00:00
Riddle Hsu
cea3f5b5da Merge "Toggle orientation sensor outside of WM lock" into tm-dev am: 89e92e9bd0 am: 111bca5c30 am: c1369e2d25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18027823

Change-Id: Ic903cc3764ba4cbf5ead6c7e14c0678ff4e16842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:40:20 +00:00
Charles Chen
7500949681 Merge "Update SplitContainer for non-finishing containers" into tm-dev am: 9040b7e261 am: 912c76ad73 am: 6de7098922 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030508

Change-Id: Ia696256d03a4634080e7c47282b127df6ee4d4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:40:08 +00:00
Philip Quinn
835da1be99 Merge "Revert "added call notif exemption to PostNotificationRunnable"" into tm-dev am: e536aa4f9e am: 8a540e5d76 am: b1cfcaea6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130632

Change-Id: I4a14267394baf8d1e1a725356b1dcfe811670588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:39:56 +00:00
Riddle Hsu
5d382c69fb Merge "Streamline fillTaskInfo a bit" into tm-qpr-dev am: 923e43dc70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17822363

Change-Id: I70e51368481233af21911874418715d38de61a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:39:43 +00:00
TreeHugger Robot
5958b16a2f Merge "Deprecate and remove ProcessStateRecord.mAllowStartFgsState field." into tm-dev am: a683c1ba94 am: cd3eca73f7 am: 1d92b42d8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18124902

Change-Id: I30313c092cb630becf5b52aec5470fcfa6372c33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:39:32 +00:00
TreeHugger Robot
489e6d6b1a Merge "ColorSchemeTransition now updates the ripple color" into tm-dev am: a776c95416 am: d13590e665 am: d67b47cf73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17954103

Change-Id: Id6057d3c626cd29099254de01b3da37f0d95cabc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:39:17 +00:00
TreeHugger Robot
bc98e85dbd Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev am: ae7d1beb80 am: fb1ee89cef am: 5310bc6a55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956048

Change-Id: Ie0054327414b8175d77371a4c7253f0429938838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:37:41 +00:00
Lucas Dupin
519fbc9ad9 Merge "Avoid Spell Checker initialization during anim" into tm-dev am: ae0a72f3c7 am: edd34250c5 am: 13150f550b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18128982

Change-Id: I4f58caa1baf92077636e70fa41cbedbfa851a0e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:37:25 +00:00
TreeHugger Robot
effc2cd303 Merge "Add some extra exception catching/logging to readxml" into tm-dev am: 2ca31b10ab am: f6f74e0e82 am: c239354bbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18094505

Change-Id: I5c6a9173848568da3694ce10694bda9c90005760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:37:14 +00:00
Rhed Jao
d1405e4b9f Merge "Fix incorrect PackageSetting in the SharedUserSetting" into tm-dev am: a22156f40d am: 59f972ae6e am: 9e98853f04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988068

Change-Id: I9205deb09582a4b6da9b19e05a414ec1fb8fe35f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:37:03 +00:00
TreeHugger Robot
e3dfeeecde Merge "Fix ManualBenchmarkState iteration unit" into tm-dev am: 1c51fb46b1 am: 28149c351f am: b3dfec5c5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097689

Change-Id: I73c923dd639a8d3038140d37a1e3949a328c4552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:36:52 +00:00
TreeHugger Robot
f6e2941f65 Merge "Notify organizer about TaskFragment parent windowing mode change" into tm-dev am: 6725f73a88 am: 963dc4e957 am: 9385fc4b95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18032087

Change-Id: Ie71dcd27bb56a77c1e08cd49f2557898772c1089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:36:40 +00:00
Victor Berchet
201ac1211e [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: aeecad4897 -s ours am: bcf1533d30 -s ours am: c410410d1c -s ours am: 36db8e0497 -s ours am: dba5d3302e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c14a04b28b3080d80007e699076c5e133e8d66a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:36:22 +00:00
Victor Berchet
d573755e31 [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 56f74b2e6e -s ours am: abc0fd6965 -s ours am: 91ee254850 -s ours am: 03c479974d -s ours am: f314a7708d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefa5427ef8a24e67927db398a095e3e252301ad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:36:20 +00:00
Victor Berchet
b6b56f1a84 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: 46897fa1e5 -s ours am: c7e7366bca -s ours am: a94a956069 -s ours am: e019ae61a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If217248b49cda2af3a103ec715c77972ef4517ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:35:58 +00:00
Victor Berchet
70afe1592d [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 62a0230994 -s ours am: 6728cfa75f -s ours am: 7f53a79ac3 -s ours am: 3760358c7b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iceaa840339fb37b6c2a8e6a3167d4317e638c321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:35:56 +00:00
Shaowei Shen
49142d48ff Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property for endTouchArea" into tm-qpr-dev am: e060e7d02a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18122463

Change-Id: I9a7eeb97a9a89cc8dc727325627337958ff848d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:35:44 +00:00
TreeHugger Robot
71f3d9eec3 Merge "[conflict] DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property for endTouchArea am: 92acd3932c" into tm-qpr-dev-plus-aosp 2022-05-04 11:30:55 +00:00
Automerger Merge Worker
b3d69b70ee Merge "Merge "Check and speed compile System UI on boot." into tm-dev am: 59eb754359 am: 49257fa60d" into tm-d1-dev-plus-aosp am: 4f36b90d60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907956

Change-Id: Idfcd8723131b13cf46a2b039c9159177bbd86fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:30:16 +00:00
Jiakai Zhang
63466f4ca9 Merge "Check and speed compile System UI on boot." into tm-dev am: 59eb754359 am: 2211f9a2ee am: cec111534b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907956

Change-Id: I31440555e64443a58788fe7477d9219d9f6d46f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 11:29:54 +00:00