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

Commit 494dd7f1 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch '558os-r-fix-emulator-bootloop' into 'v1-r' 

StorageManagerService: Ignore user storage exceptions for emulator builds

See merge request e/os/android_frameworks_base!116
parents 8f431da1 b0604352

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

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import android.content.res.ObbInfo; 
import android.database.ContentObserver;

import android.net.Uri;

import android.os.Binder;

import android.os.Build;

import android.os.DropBoxManager;

import android.os.Environment;

import android.os.Handler;
@@ -3410,6 +3411,11 @@ class StorageManagerService extends IStorageManager.Stub 
        } catch (Exception e) {

            EventLog.writeEvent(0x534e4554, "224585613", -1, "");

            Slog.wtf(TAG, e);



            if (Build.IS_EMULATOR) {

                return;

            }



            // Make sure to re-throw this exception; we must not ignore failure

            // to prepare the user storage as it could indicate that encryption

            // wasn't successfully set up.