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

Commit 93b7acdd authored by Jesse Evans's avatar Jesse Evans Committed by android-build-merger
Browse files

Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev am: 684b5381 

am: 3d1676cf

Change-Id: I0cc0d165ad5bceb1d93cbe48030e347b53e3caf4
parents 7cac2b0e 3d1676cf

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -38143,6 +38143,7 @@ package android.provider { 
    field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";

    field public static final java.lang.String INPUT_METHOD_SELECTOR_VISIBILITY = "input_method_selector_visibility";

    field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

    field public static final java.lang.String INSTANT_APPS_ENABLED = "instant_apps_enabled";

    field public static final java.lang.String LOCATION_MODE = "location_mode";

    field public static final int LOCATION_MODE_BATTERY_SAVING = 2; // 0x2

    field public static final int LOCATION_MODE_HIGH_ACCURACY = 3; // 0x3

core/java/android/provider/Settings.java

+2 −1
Original line number Diff line number Diff line
@@ -6922,7 +6922,8 @@ public final class Settings { 
         *

         * @hide

         */

        public static final String WEB_ACTION_ENABLED = "web_action_enabled";

        @SystemApi

        public static final String INSTANT_APPS_ENABLED = "instant_apps_enabled";



        /**

         * Has this pairable device been paired or upgraded from a previously paired system.

core/proto/android/providers/settings.proto

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ message SecureSettingsProto { 
    SettingProto automatic_storage_manager_downloads_days_to_retain = 163;

    SettingProto qs_tiles = 164;

    SettingProto demo_user_setup_complete = 165;

    SettingProto web_action_enabled = 166;

    SettingProto instant_apps_enabled = 166;

    SettingProto device_paired = 167;

}

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ public class SettingsBackupTest { 
                 Settings.Secure.USER_SETUP_COMPLETE,

                 Settings.Secure.VOICE_INTERACTION_SERVICE,

                 Settings.Secure.VOICE_RECOGNITION_SERVICE,

                 Settings.Secure.WEB_ACTION_ENABLED);

                 Settings.Secure.INSTANT_APPS_ENABLED);



    @Test

    public void systemSettingsBackedUpOrBlacklisted() {

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

+2 −2
Original line number Diff line number Diff line
@@ -1435,8 +1435,8 @@ class SettingsProtoDumpUtil { 
                Settings.Secure.DEMO_USER_SETUP_COMPLETE,

                SecureSettingsProto.DEMO_USER_SETUP_COMPLETE);

        dumpSetting(s, p,

                Settings.Secure.WEB_ACTION_ENABLED,

                SecureSettingsProto.WEB_ACTION_ENABLED);

                Settings.Secure.INSTANT_APPS_ENABLED,

                SecureSettingsProto.INSTANT_APPS_ENABLED);

        dumpSetting(s, p,

                Settings.Secure.DEVICE_PAIRED,

                SecureSettingsProto.DEVICE_PAIRED);