diff --git a/api/system-current.txt b/api/system-current.txt index 5ef293eea898d..93515dab2bd6a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -38138,6 +38138,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 diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 287ab9ecdf516..b037ee507d100 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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. diff --git a/core/proto/android/providers/settings.proto b/core/proto/android/providers/settings.proto index 98c9e781efee4..ce951defadbc5 100644 --- a/core/proto/android/providers/settings.proto +++ b/core/proto/android/providers/settings.proto @@ -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; } diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 782a50f12b2b5..d7887d333095c 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -473,7 +473,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() { diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 4a54c0e909d2f..bac694f535a7c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -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); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 71f700cb60604..c51e87b3986a1 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -90,7 +90,6 @@ import static com.android.internal.app.IntentForwarderActivity.FORWARD_INTENT_TO import static com.android.internal.content.NativeLibraryHelper.LIB64_DIR_NAME; import static com.android.internal.content.NativeLibraryHelper.LIB_DIR_NAME; import static com.android.internal.util.ArrayUtils.appendInt; -import static com.android.server.pm.Installer.DEXOPT_PUBLIC; import static com.android.server.pm.InstructionSets.getAppDexInstructionSets; import static com.android.server.pm.InstructionSets.getDexCodeInstructionSet; import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets; @@ -164,7 +163,6 @@ import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; import android.content.pm.ProviderInfo; import android.content.pm.ResolveInfo; -import android.content.pm.SELinuxUtil; import android.content.pm.ServiceInfo; import android.content.pm.SharedLibraryInfo; import android.content.pm.Signature; @@ -273,7 +271,6 @@ import com.android.server.SystemConfig; import com.android.server.SystemServerInitThreadPool; import com.android.server.Watchdog; import com.android.server.net.NetworkPolicyManagerInternal; -import com.android.server.pm.BackgroundDexOptService; import com.android.server.pm.Installer.InstallerException; import com.android.server.pm.PermissionsState.PermissionState; import com.android.server.pm.Settings.DatabaseVersion; @@ -299,7 +296,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileDescriptor; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.FilenameFilter; @@ -20179,14 +20175,14 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); public void onChange(boolean selfChange) { mEphemeralAppsDisabled = (Global.getInt(resolver, Global.ENABLE_EPHEMERAL_FEATURE, 1) == 0) || - (Secure.getInt(resolver, Secure.WEB_ACTION_ENABLED, 1) == 0); + (Secure.getInt(resolver, Secure.INSTANT_APPS_ENABLED, 1) == 0); } }; mContext.getContentResolver().registerContentObserver(android.provider.Settings.Global .getUriFor(Global.ENABLE_EPHEMERAL_FEATURE), false, co, UserHandle.USER_SYSTEM); mContext.getContentResolver().registerContentObserver(android.provider.Settings.Global - .getUriFor(Secure.WEB_ACTION_ENABLED), false, co, UserHandle.USER_SYSTEM); + .getUriFor(Secure.INSTANT_APPS_ENABLED), false, co, UserHandle.USER_SYSTEM); co.onChange(true); // Disable any carrier apps. We do this very early in boot to prevent the apps from being