From 0637680c55c13272b012bd111726367503ca166a Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 11 Feb 2019 12:20:02 -0700 Subject: Enable isolated storage by default. We've been dogfooding the isolated storage feature for many months on various internal groups, and we're ready to enable it globally. Bug: 112545973 Test: executed entire CTS suite using forrest Change-Id: Id1b0d40e628d9d790143d50e7c6f5fa06ebd8b38 --- core/java/android/os/storage/StorageManager.java | 2 +- core/jni/com_android_internal_os_Zygote.cpp | 2 +- services/core/java/com/android/server/StorageManagerService.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 735f4f253594..43c906495cb6 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -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)); } /** diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index d04db92294d7..5cecf66a593c 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -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"; diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index e7d7434b5dc8..5da281a5ebc3 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -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(); -- cgit v1.2.3-59-g8ed1b