summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-04-20 21:20:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-20 21:20:22 +0000
commit8cdecf2bf3f42be9f813b5bf57f00ac8de0cf98e (patch)
tree876479b98d0ac476488bad693d77fbb74db48b0f
parent4c523a5ac259fbc8b3691b1c350ba9b02620c059 (diff)
parentdf7e8c720382b63d9989e8ade0279dc745603cae (diff)
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>
-rw-r--r--services/core/java/com/android/server/StorageManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index f2728fd5bec9..51b4d01648f9 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -126,6 +126,7 @@ import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.AtomicFile;
import android.util.DataUnit;
+import android.util.EventLog;
import android.util.Log;
import android.util.Pair;
import android.util.Slog;
@@ -3340,6 +3341,7 @@ class StorageManagerService extends IStorageManager.Stub
}
}
} catch (Exception e) {
+ EventLog.writeEvent(0x534e4554, "224585613", -1, "");
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