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

Commit b6562712 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Enable isolated storage by default."

parents b40df137 0637680c

core/java/android/os/storage/StorageManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1545,7 +1545,7 @@ public class StorageManager { 
    public static boolean hasIsolatedStorage() {

        // Prefer to use snapshot for current boot when available

        return SystemProperties.getBoolean(PROP_ISOLATED_STORAGE_SNAPSHOT,

                SystemProperties.getBoolean(PROP_ISOLATED_STORAGE, false));

                SystemProperties.getBoolean(PROP_ISOLATED_STORAGE, true));

    }



    /**

core/jni/com_android_internal_os_Zygote.cpp

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ static void MountEmulatedStorage(uid_t uid, jint mount_mode, 
        return;

    }



    if (GetBoolProperty(kIsolatedStorageSnapshot, GetBoolProperty(kIsolatedStorage, false))) {

    if (GetBoolProperty(kIsolatedStorageSnapshot, GetBoolProperty(kIsolatedStorage, true))) {

        if (mount_mode == MOUNT_EXTERNAL_FULL || mount_mode == MOUNT_EXTERNAL_LEGACY) {

            storageSource = (mount_mode == MOUNT_EXTERNAL_FULL)

                    ? "/mnt/runtime/full" : "/mnt/runtime/write";

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

+2 −2
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ class StorageManagerService extends IStorageManager.Stub 
        } else if (remote == 1) {

            res = true;

        } else {

            res = false;

            res = true;

        }



        Slog.d(TAG, "Isolated storage local flag " + local + " and remote flag "
@@ -1533,7 +1533,7 @@ class StorageManagerService extends IStorageManager.Stub 


        // Snapshot feature flag used for this boot

        SystemProperties.set(StorageManager.PROP_ISOLATED_STORAGE_SNAPSHOT, Boolean.toString(

                SystemProperties.getBoolean(StorageManager.PROP_ISOLATED_STORAGE, false)));

                SystemProperties.getBoolean(StorageManager.PROP_ISOLATED_STORAGE, true)));



        mContext = context;

        mResolver = mContext.getContentResolver();