summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-04-20 20:57:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-20 20:57:33 +0000
commit81d8843b6e3e32b7d63780650f6948954dc352d8 (patch)
tree89468c6b6c61531225e7666b9a2da11886c022cf
parent8ea6cb03ff229ab9f311c1e83c92e502ea3bc825 (diff)
parentbc7a25dff452e16de7c614cdee79766c89647f3d (diff)
Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4
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>
-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 19596ba142cd..0a23ab8184e5 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -128,6 +128,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;
@@ -3398,6 +3399,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