Jay Aliomer
1fc22b6673
Exclude silent notifications from lockscreen
...
regardless of the parent's priority, silent notifications should be
hidden
Fixes: 228756327
Test: KeyguardNotificationVisibilityProviderTest
Change-Id: I12b001b4d54a9bc8d91efa34874b4434dbfff118
2022-05-04 15:01:23 +00:00
TYM Tsai
bd72a95c1f
Merge "Use device config to control hints allow list for fill dialog" into tm-dev
2022-04-21 02:01:13 +00:00
Treehugger Robot
0a355570a0
[automerger skipped] Merge "Convert apct/managed_provisioning/presubmit_test to Test Mapping Suite." am: 6e5f312d6f am: a074c28940 am: 3f03074258 -s ours
...
am skip reason: Merged-In I8234cc5cadae2ed2162cb09ec8695c7262fcdb2e with SHA-1 6d9b0f714e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067309
Change-Id: I77d01f51e0d6873f74601fc7bb353c85757d03f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 01:38:08 +00:00
Treehugger Robot
3f03074258
Merge "Convert apct/managed_provisioning/presubmit_test to Test Mapping Suite." am: 6e5f312d6f am: a074c28940
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067309
Change-Id: I2a6286168ed81a72215361302fed089400bf39be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 01:23:02 +00:00
Treehugger Robot
a074c28940
Merge "Convert apct/managed_provisioning/presubmit_test to Test Mapping Suite." am: 6e5f312d6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067309
Change-Id: Idde23dc0223476030cf45c6cb0ba438121c6cc52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-21 00:58:08 +00:00
Treehugger Robot
6e5f312d6f
Merge "Convert apct/managed_provisioning/presubmit_test to Test Mapping Suite."
2022-04-21 00:32:24 +00:00
TreeHugger Robot
bf068a0636
Merge "Update Chooser shadows to match Launcher." into tm-dev
2022-04-21 00:22:20 +00:00
Song Hu
84367ac5e8
Merge "Fix pin icon un-allignment on direct share row" into tm-dev
2022-04-21 00:05:17 +00:00
Song Hu
a9012710e0
Merge "Open dialog panel after long pressing a direct share target to allow pin/unpin the target. Communicate with ShortcutManager/Launcherapps to store pin info in ShortcutService." into tm-dev
2022-04-21 00:04:58 +00:00
Eric Biggers
f36b02f2cd
[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours am: 76ce5348f3 -s ours am: 0be1e471f1 -s ours am: 653d7a1aa7 -s ours
...
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: I1920b88320e7e294de8209424ccd46e2fdc4abcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:23:57 +00:00
Eric Biggers
f800ae0af6
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours am: f07b486484 -s ours am: 2f6cc5bbee -s ours am: ae87448c7f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: Ibddee0bf7f72161c6a5a3124bfafd6b87e09288b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:23:32 +00:00
Eric Biggers
1fc58c3f91
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours am: fac1d6ed60 -s ours am: 5c7ad21e36 -s ours am: ad132bbcaf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250
Change-Id: I4b2e2dde46a486dbbda6b99daa7836a7f8b7cf08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:23:21 +00:00
Eric Biggers
a8f2b4fb2e
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours am: 790a5e0467 -s ours am: c86e05a909 -s ours am: b4d81eb041 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249
Change-Id: I232f1d7bdfa0224d58d54b189246ed8a83987471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:22:56 +00:00
Eric Biggers
0bb0811c5d
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours am: 7b3aac9d05 -s ours am: d8103629fc -s ours am: acb7f4be7d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248
Change-Id: I2c8cb822b6e586b273f005263400990f36989acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:22:22 +00:00
Eric Biggers
de803e3dce
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours am: 3fea57d1ca -s ours am: c3fed9e116 -s ours am: 42bb7eaa2c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247
Change-Id: I9bc483e2263d23fec7800141c31a37cf9d54caff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:21:58 +00:00
Jon Eckenrode
19270f18c5
Merge "Revised the API documentation for overloaded methods getRawX, getRawY, getX, and getY of MotionEvent." am: 29b6451cef am: ad75b0c0f6 am: 5db658b8f3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2034083
Change-Id: I6eec0cb2d7dc0dd3fd9c0b42bef603806af3d41d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:21:22 +00:00
Eric Biggers
653d7a1aa7
[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours am: 76ce5348f3 -s ours am: 0be1e471f1 -s ours
...
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: Ic2fd156f1d50503683da939f1235003c976db5a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:06:35 +00:00
Eric Biggers
ae87448c7f
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours am: f07b486484 -s ours am: 2f6cc5bbee -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: Ie3432cab7028d9e506d25b07e3b7bbaa2dd83f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:06:16 +00:00
Eric Biggers
ad132bbcaf
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours am: fac1d6ed60 -s ours am: 5c7ad21e36 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250
Change-Id: I8555fa1ef1271af3b5b8569d7cac24b68365a6ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:05:58 +00:00
Eric Biggers
b4d81eb041
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours am: 790a5e0467 -s ours am: c86e05a909 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249
Change-Id: I4899674f56d7cdfe6caf63331b5e16b7cb4da78e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:05:27 +00:00
Eric Biggers
acb7f4be7d
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours am: 7b3aac9d05 -s ours am: d8103629fc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248
Change-Id: Iec5ad1eb5840f10dbe5590010b7208638d4e3c10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:04:55 +00:00
Eric Biggers
42bb7eaa2c
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours am: 3fea57d1ca -s ours am: c3fed9e116 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247
Change-Id: Ia7152b7bb31f3c9298040b556bc4235a834cbbe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 23:04:32 +00:00
Jon Eckenrode
5db658b8f3
Merge "Revised the API documentation for overloaded methods getRawX, getRawY, getX, and getY of MotionEvent." am: 29b6451cef am: ad75b0c0f6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2034083
Change-Id: I277c8f270068a1d2debaa9090551ae7e268fdd55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:58:18 +00:00
Automerger Merge Worker
e1be235367
Merge changes from topic "am-28d457cd546149c3b2acf232ddb9ed91" into tm-dev
...
* changes:
[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours am: a7f9adbc94 -s ours
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours am: fc90023265 -s ours
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours am: 74699e901a -s ours
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours am: 468c5c5a2f -s ours
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours am: 79f227182b -s ours
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours am: ceb59ff994 -s ours
2022-04-20 22:44:50 +00:00
Eric Biggers
3989351a10
[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours am: a7f9adbc94 -s ours
...
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: Iefe8fc902b805fef24459c197b152f9355de0f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:44:04 +00:00
Eric Biggers
904cd104c7
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours am: fc90023265 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: I744485c57bb65eeec962cff5fd8d60b697763a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:43:53 +00:00
Eric Biggers
b01aa7c495
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours am: 74699e901a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250
Change-Id: I82e3d8b47d05412bfc5c493d85144148fc949a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:43:29 +00:00
Eric Biggers
791ac98277
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours am: 468c5c5a2f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249
Change-Id: I8d235a0bdd3b89ee31b76fa0ff33e64b59cb00a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:43:06 +00:00
Eric Biggers
65d01ef03d
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours am: 79f227182b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248
Change-Id: If9b6a2862efc18f47934972aefb7115cd2d8ced6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:42:46 +00:00
Nate Myren
65dc0639fc
Merge "Remove temp handling of POST_NOTIFICATIONS" into tm-dev
2022-04-20 22:42:31 +00:00
Eric Biggers
0be1e471f1
[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours am: 76ce5348f3 -s ours
...
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: I9bbdb52e107c90eefc21caa666ebd8edca8dad4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:42:30 +00:00
Eric Biggers
2f6cc5bbee
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours am: f07b486484 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: If08a28b9bb75749f42f2fda7625925332daf2c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:42:28 +00:00
Eric Biggers
5c7ad21e36
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours am: fac1d6ed60 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250
Change-Id: I2bf498235aa40a2b00b514a0c03aaeeb8c20eed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:42:23 +00:00
Eric Biggers
c86e05a909
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours am: 790a5e0467 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249
Change-Id: Ifd239d213dc87e0e717010e4c251230b92ec5cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:42:21 +00:00
Eric Biggers
d8103629fc
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours am: 7b3aac9d05 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248
Change-Id: Ic3e5137a567c4180dc1454e541f3177096bc34a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:42:19 +00:00
Eric Biggers
c3fed9e116
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours am: 3fea57d1ca -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247
Change-Id: I433ee45f7cc5a33eccd9a6a6aeac4b5db9d9e411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:42:16 +00:00
Eric Biggers
5a44393ea9
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours am: ceb59ff994 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247
Change-Id: I9dc6bec433e0d57139eed8b0b60e2b97297cd134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:42:12 +00:00
Jon Eckenrode
ad75b0c0f6
Merge "Revised the API documentation for overloaded methods getRawX, getRawY, getX, and getY of MotionEvent." am: 29b6451cef
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2034083
Change-Id: I8d793753a9e0f5679aa4539b07fdd3b7df4773fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:41:18 +00:00
Emilian Peev
50a87aa8b1
Merge "Camera: Add support for client requests&results for advanced extensions" into tm-dev
2022-04-20 22:36:16 +00:00
TreeHugger Robot
4375907404
Merge "[User Switcher] Use Log.e instead of Log.wtf" into tm-dev
2022-04-20 22:31:44 +00:00
TreeHugger Robot
a300bfc5e0
Merge "Rename narc to cake." into tm-dev
2022-04-20 22:27:01 +00:00
Eric Biggers
76ce5348f3
[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours
...
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: Ib5a6eb67de330e4250162773d805226d5b0c2657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:25:21 +00:00
Eric Biggers
f07b486484
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: I8215414f6dcb9f8db9c8700060a1146a84e424c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:25:20 +00:00
Eric Biggers
fac1d6ed60
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250
Change-Id: If74e1d1c0ecc7cca86595b006920151fc415311c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:25:08 +00:00
Eric Biggers
790a5e0467
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249
Change-Id: I6a8f1710e07b4ff76dfa868bfc2f968ff2d8c050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:25:06 +00:00
Eric Biggers
7b3aac9d05
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248
Change-Id: I8dd0362b809bf701fd5118d7696d9a8da34a3bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:24:55 +00:00
Eric Biggers
3fea57d1ca
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247
Change-Id: Ie97795a07e668817f027aaadcbdafcbc1fbd7694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:24:49 +00:00
Sudheer Shanka
b771b2215a
Merge "Add BlobStoreManager.releaseAllLeases()." into tm-dev
2022-04-20 22:24:39 +00:00
Eric Biggers
a7f9adbc94
[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours
...
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b698 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: Ic6acb7e15810454d0ad2eedee4398e9af44d0f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:23:17 +00:00
Eric Biggers
fc90023265
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194
Change-Id: Ibc085615ee2238bb7eea51aa7e1f49a45f78f2dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 22:23:14 +00:00