mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-06-26 14:42:13 +00:00
082bc48c32
https://review.lineageos.org/q/topic:P_asb_2022-05 https://review.lineageos.org/q/topic:P_asb_2022-06 https://review.lineageos.org/q/topic:P_asb_2022-07 https://review.lineageos.org/q/topic:P_asb_2022-08 https://review.lineageos.org/q/topic:P_asb_2022-09 https://review.lineageos.org/q/topic:P_asb_2022-10 https://review.lineageos.org/q/topic:P_asb_2022-11 https://review.lineageos.org/q/topic:P_asb_2022-12 https://review.lineageos.org/q/topic:P_asb_2023-01 https://review.lineageos.org/q/topic:P_asb_2023-02 https://review.lineageos.org/q/topic:P_asb_2023-03 https://review.lineageos.org/q/topic:P_asb_2023-04 https://review.lineageos.org/q/topic:P_asb_2023-05 https://review.lineageos.org/q/topic:P_asb_2023-06 https://review.lineageos.org/q/topic:P_asb_2023-07 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/361250 https://review.lineageos.org/q/topic:P_asb_2023-08 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/364606 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/365328 https://review.lineageos.org/q/topic:P_asb_2023-09 https://review.lineageos.org/q/topic:P_asb_2023-10 https://review.lineageos.org/q/topic:P_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/374916 https://review.lineageos.org/q/topic:P_asb_2023-12 https://review.lineageos.org/q/topic:P_asb_2024-01 https://review.lineageos.org/q/topic:P_asb_2024-02 https://review.lineageos.org/q/topic:P_asb_2024-03 https://review.lineageos.org/q/topic:P_asb_2024-04 Signed-off-by: Tavi <tavi@divested.dev>
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Eric Biggers <ebiggers@google.com>
|
|
Date: Fri, 13 Aug 2021 13:37:55 -0700
|
|
Subject: [PATCH] StorageManagerService: don't ignore failures to prepare user
|
|
storage
|
|
|
|
We must never leave directories unencrypted.
|
|
|
|
Bug: 164488924
|
|
Bug: 224585613
|
|
Change-Id: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2
|
|
(cherry picked from commit 50946dd15fd14cbf92b5c7e32ac7a0f088b8b302)
|
|
Merged-In: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2
|
|
(cherry picked from commit f80dd3ecd46db03005423e7fac28a0def49d0140)
|
|
Merged-In: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2
|
|
---
|
|
.../core/java/com/android/server/StorageManagerService.java | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
|
|
index 910e3e345f69..f6ca63a48a39 100644
|
|
--- a/services/core/java/com/android/server/StorageManagerService.java
|
|
+++ b/services/core/java/com/android/server/StorageManagerService.java
|
|
@@ -2609,8 +2609,12 @@ class StorageManagerService extends IStorageManager.Stub
|
|
|
|
try {
|
|
mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags);
|
|
- } catch (Exception e) {
|
|
+ } catch (RemoteException e) {
|
|
Slog.wtf(TAG, e);
|
|
+ // Make sure to re-throw this exception; we must not ignore failure
|
|
+ // to prepare the user storage as it could indicate that encryption
|
|
+ // wasn't successfully set up.
|
|
+ throw new RuntimeException(e);
|
|
}
|
|
}
|
|
|