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

Commit 81d8843b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25df 

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



Change-Id: I74d261c370252fac3a7a5eca76ced6bac41c678a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ea6cb03 bc7a25df

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