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

[RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84f8

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

Change-Id: Ibb1049aa4c143ba2d4e04a021cb2546519a1996e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2022-04-25 18:05:06 +00:00
committed by Automerger Merge Worker
parent 7271432de9 2f2e7d84f8
commit 51fbb8e819
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

@@ -117,6 +117,7 @@ import android.text.format.DateUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
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;
@@ -2848,6 +2849,7 @@ class StorageManagerService extends IStorageManager.Stub
try { try {
mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags); mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags);
} 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