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

Commit f40ae937 authored by Shafik Nassar's avatar Shafik Nassar Committed by Android (Google) Code Review
Browse files

Merge "Make DeviceConfig's storage nam space _native_boot"

parents 1b74a25f 91b34610

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -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";

core/java/android/provider/DeviceConfig.java

+10 −0
Original line number Diff line number Diff line
@@ -257,11 +257,21 @@ 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.

     *

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+3 −2
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+2 −1
Original line number Diff line number Diff line
@@ -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;