Commit Graph

758125 Commits

Author SHA1 Message Date
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
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
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
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
Jon Eckenrode
ea8489c0ce Merge "Updated API documentation of screenWidthDp and screenHeightDp to include multiple-screen behavior." into tm-dev 2022-04-20 22:23:10 +00:00
Eric Biggers
74699e901a [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: I7bff50b60c819687ec5cafd43739e16269a5f5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:23:05 +00:00
Eric Biggers
468c5c5a2f [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: I33a2e1607897c76695026069650fd9b07b3fa67b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:23:00 +00:00
Eric Biggers
79f227182b [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: Ie7e90f9d053de78a26899653bc0a8c19aef951b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:22:40 +00:00
Eric Biggers
ceb59ff994 [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: I8a0efff807a7d11e9a6b199966443d994cc3752c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:22:30 +00:00
Jon Eckenrode
29b6451cef Merge "Revised the API documentation for overloaded methods getRawX, getRawY, getX, and getY of MotionEvent." 2022-04-20 22:22:05 +00:00
Eric Biggers
ff2c282fb4 [automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -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: I647f13be357f4d5d19d2577210113c26324fb8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:01:01 +00:00
Eric Biggers
54a7bd48dc [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85a4346eec74128ae6e9b1bb99e3e96e43c50aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:00:53 +00:00
Eric Biggers
0f285346e5 [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I915cad24ff570c667508f9de0fef3e69c25df310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:00:46 +00:00
Eric Biggers
ef37c0da49 [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I876562e133dec3532333cf684b95b4d282682bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:00:38 +00:00
Eric Biggers
39bf332aab [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba7aa9d2bbacce83e543d86e798615d2b3aa0625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:00:30 +00:00
Eric Biggers
a86355bfef [automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0f7bb7babdcc795d81b597625de44e536ff252a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:00:24 +00:00
TreeHugger Robot
2f98c9a4cc Merge "Remove two timeouts in ResolverActivityTest." into tm-dev 2022-04-20 21:53:19 +00:00
Eric Biggers
5526853e6d Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194

Change-Id: Id5460b2d89d889f640893226e1cba232ce1ec0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:39:36 +00:00
Eric Biggers
4df21cf7ca [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452194

Change-Id: I534bf5bd4ab88aee8afb8d1bc8f6ab732e966e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:39:33 +00:00
Eric Biggers
be952611ed [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416250

Change-Id: I9f47d7a36a6d3d6c1ba5b82d17f21c15dd9f7235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:39:31 +00:00
Eric Biggers
4eadb46170 [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416249

Change-Id: I641bedd5939fe451bd7c478c2105a5a6652e7e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:39:28 +00:00
Eric Biggers
d685b63f1a [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416248

Change-Id: Icbaf5892b2804757bc831533fbf2adf851f89f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:39:22 +00:00
Eric Biggers
ee88d1fd14 [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416247

Change-Id: I034fc93d091ee1944a5487e58dd61605bc8e19ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:39:18 +00:00
TreeHugger Robot
07435b1b47 [automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4 am: 856b62f907 am: df7e8c7203 am: 8cdecf2bf3 -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/+/17452466

Change-Id: I0151ce167fdb8f62c43f0cca038b226152fe0b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:37:53 +00:00
Eric Biggers
e122ed1a6d [automerger skipped] Ignore errors preparing user storage for existing users am: e667b60402 am: 1dd78739ee am: 9d405365cf am: 4c523a5ac2 -s ours
am skip reason: Merged-In I9bdd1a4bf5b14542adb901f264a91d489115c89b with SHA-1 e667b60402 is already in history

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

Change-Id: I107287cb2cb4dcaebc7e859e5c3b9c9328d141c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:37:43 +00:00
Eric Biggers
fd12293729 [automerger skipped] UserDataPreparer: reboot to recovery for system user only am: fd31f740ce am: 7abafd53c9 am: d4f7100ba0 am: 4e4f5a6325 -s ours
am skip reason: Merged-In Ia1db01ab4ec6b3b17d725f391c3500d92aa00f97 with SHA-1 fd31f740ce is already in history

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

Change-Id: I39c7057177032205bc7550f1617a65cbbfacacfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:37:16 +00:00
Eric Biggers
871c9964c6 [automerger skipped] UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026ca am: ad111e22f8 am: 9eec832b84 -s ours am: 87fd03af4d -s ours
am skip reason: Merged-In Ib5e91d2510b25780d7a161b91b5cee2f6f7a2e54 with SHA-1 5256365e65 is already in history

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

Change-Id: I62940c9f865acceab83ff3262c9bfdc0c019a6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:36:56 +00:00
Eric Biggers
5e7d5c80aa [automerger skipped] [automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476 am: 63fec800ad am: 0ee586deaa -s ours am: 3f976d45b5 -s ours
am skip reason: Merged-In I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2 with SHA-1 9d2bb776ed is already in history

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

Change-Id: I8cccce4225e93ba21c7482d42a9264d1bf4981c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:36:24 +00:00
TreeHugger Robot
8cdecf2bf3 Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4 am: 856b62f907 am: df7e8c7203
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452466

Change-Id: Id73438fbad391a3013287dc2671af71325307771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:20:22 +00:00