Merge "Always copy value from DeviceConfig." (9b4d5c22) · Commits · e / os / android_frameworks_base

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -802,10 +802,7 @@ class StorageManagerService extends IStorageManager.Stub
		// For now, simply clone property when it changes
		DeviceConfig.addOnPropertyChangedListener(DeviceConfig.Storage.NAMESPACE,
		mContext.getMainExecutor(), (namespace, name, value) -> {
		if (DeviceConfig.Storage.ISOLATED_STORAGE_ENABLED.equals(name)) {
		Settings.Global.putString(mResolver,
		Settings.Global.ISOLATED_STORAGE_REMOTE, value);
		}
		refreshIsolatedStorageSettings();
		});
		refreshIsolatedStorageSettings();
		}
		@@ -840,6 +837,12 @@ class StorageManagerService extends IStorageManager.Stub
		}

		private void refreshIsolatedStorageSettings() {
		// Always copy value from newer DeviceConfig location
		Settings.Global.putString(mResolver,
		Settings.Global.ISOLATED_STORAGE_REMOTE,
		DeviceConfig.getProperty(DeviceConfig.Storage.NAMESPACE,
		DeviceConfig.Storage.ISOLATED_STORAGE_ENABLED));

		final int local = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.ISOLATED_STORAGE_LOCAL, 0);
		final int remote = Settings.Global.getInt(mContext.getContentResolver(),