Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4

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

Change-Id: I74d261c370252fac3a7a5eca76ced6bac41c678a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-20 20:57:33 +00:00
committed by Automerger Merge Worker
parent 8ea6cb03ff bc7a25dff4
commit 81d8843b6e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -128,6 +128,7 @@ import android.util.ArrayMap;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.AtomicFile; import android.util.AtomicFile;
import android.util.DataUnit; import android.util.DataUnit;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.util.Slog; import android.util.Slog;
@@ -3398,6 +3399,7 @@ class StorageManagerService extends IStorageManager.Stub
} }
} }
} catch (Exception e) { } catch (Exception e) {
EventLog.writeEvent(0x534e4554, "224585613", -1, "");
Slog.wtf(TAG, e); Slog.wtf(TAG, e);
// Make sure to re-throw this exception; we must not ignore failure // Make sure to re-throw this exception; we must not ignore failure
// to prepare the user storage as it could indicate that encryption // to prepare the user storage as it could indicate that encryption