diff options
5 files changed, 18 insertions, 5 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index fcf69a7592a4..e92dc89245ba 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5901,7 +5901,8 @@ package android.provider { field public static final String NAMESPACE_RUNTIME_NATIVE = "runtime_native"; field public static final String NAMESPACE_RUNTIME_NATIVE_BOOT = "runtime_native_boot"; field public static final String NAMESPACE_SCHEDULER = "scheduler"; - field public static final String NAMESPACE_STORAGE = "storage"; + field @Deprecated public static final String NAMESPACE_STORAGE = "storage"; + field public static final String NAMESPACE_STORAGE_NATIVE_BOOT = "storage_native_boot"; field public static final String NAMESPACE_SYSTEMUI = "systemui"; field public static final String NAMESPACE_TELEPHONY = "telephony"; field public static final String NAMESPACE_TEXTCLASSIFIER = "textclassifier"; diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 5e201e4f0e42..fd1381a36f00 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -257,12 +257,22 @@ public final class DeviceConfig { /** * Namespace for storage-related features. * + * @deprecated Replace storage namespace with storage_native_boot. * @hide */ + @Deprecated @SystemApi public static final String NAMESPACE_STORAGE = "storage"; /** + * Namespace for storage-related features, including native and boot. + * + * @hide + */ + @SystemApi + public static final String NAMESPACE_STORAGE_NATIVE_BOOT = "storage_native_boot"; + + /** * Namespace for System UI related features. * * @hide diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 046ffc3c36bb..2ce4e9771d7c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -76,7 +76,7 @@ class SettingsProtoDumpUtil { ConfigSettingsProto.RUNTIME_NATIVE_SETTINGS); namespaceToFieldMap.put(DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT, ConfigSettingsProto.RUNTIME_NATIVE_BOOT_SETTINGS); - namespaceToFieldMap.put(DeviceConfig.NAMESPACE_STORAGE, + namespaceToFieldMap.put(DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT, ConfigSettingsProto.STORAGE_SETTINGS); namespaceToFieldMap.put(DeviceConfig.NAMESPACE_SYSTEMUI, ConfigSettingsProto.SYSTEMUI_SETTINGS); diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 34111a92b66e..67686e0c7236 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -814,7 +814,7 @@ class StorageManagerService extends IStorageManager.Stub } }); // For now, simply clone property when it changes - DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_STORAGE, + DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT, mContext.getMainExecutor(), (properties) -> { refreshIsolatedStorageSettings(); }); @@ -854,7 +854,8 @@ class StorageManagerService extends IStorageManager.Stub // Always copy value from newer DeviceConfig location Settings.Global.putString(mResolver, Settings.Global.ISOLATED_STORAGE_REMOTE, - DeviceConfig.getProperty(DeviceConfig.NAMESPACE_STORAGE, ISOLATED_STORAGE_ENABLED)); + DeviceConfig.getProperty(DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT, + ISOLATED_STORAGE_ENABLED)); final int local = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.ISOLATED_STORAGE_LOCAL, 0); diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 64f4a35032c0..4a6e63f2d2ab 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -86,6 +86,7 @@ public class SettingsToPropertiesMapper { DeviceConfig.NAMESPACE_NETD_NATIVE, DeviceConfig.NAMESPACE_RUNTIME_NATIVE, DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT, + DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT, }; private final String[] mGlobalSettings; @@ -276,4 +277,4 @@ public class SettingsToPropertiesMapper { String settingValue = Settings.Global.getString(mContentResolver, settingName); setProperty(propName, settingValue); } -}
\ No newline at end of file +} |