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

Commit 0ef91007 authored by Eric Biggers's avatar Eric Biggers Committed by Android Build Coastguard Worker
Browse files

[RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure 

Bug: 224585613
Change-Id: Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5
(cherry picked from commit fbb632ea)
Merged-In: Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5
(cherry picked from commit 2f2e7d84)
Merged-In: Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5
parent db90cf4f

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

+2 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ import android.text.format.DateUtils; 
import android.util.ArrayMap;

import android.util.AtomicFile;

import android.util.DataUnit;

import android.util.EventLog;

import android.util.Log;

import android.util.Pair;

import android.util.Slog;
@@ -2848,6 +2849,7 @@ class StorageManagerService extends IStorageManager.Stub 
        try {

            mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags);

        } 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