Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96687b5b authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-8e43db699b534342af60c58f6478d4bd" into tm-mainline-prod 

* changes:
  [automerge] Log to EventLog on prepareUserStorage failure 2p: fbb632ea
  Log to EventLog on prepareUserStorage failure
parents 1689a6bb 3712ac08

services/core/java/com/android/server/StorageManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -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