diff options
8 files changed, 2 insertions, 44 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3ac7deb0db08..51f4f2e29d2f 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4923,7 +4923,6 @@ public final class Settings { MOVED_TO_GLOBAL.add(Settings.Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED); MOVED_TO_GLOBAL.add(Settings.Global.WIFI_P2P_PENDING_FACTORY_RESET); MOVED_TO_GLOBAL.add(Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON); - MOVED_TO_GLOBAL.add(Settings.Global.PACKAGE_VERIFIER_ENABLE); MOVED_TO_GLOBAL.add(Settings.Global.PACKAGE_VERIFIER_TIMEOUT); MOVED_TO_GLOBAL.add(Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE); MOVED_TO_GLOBAL.add(Settings.Global.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS); @@ -9234,16 +9233,6 @@ public final class Settings { @SystemApi public static final String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update"; - /** - * Whether the package manager should send package verification broadcasts for verifiers to - * review apps prior to installation. - * 1 = request apps to be verified prior to installation, if a verifier exists. - * 0 = do not verify apps before installation - * @hide - */ - @UnsupportedAppUsage - public static final String PACKAGE_VERIFIER_ENABLE = "package_verifier_enable"; - /** Timeout for package verification. * @hide */ public static final String PACKAGE_VERIFIER_TIMEOUT = "verifier_timeout"; diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 05246a42dedc..21b3ba3d2548 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -39,7 +39,6 @@ <bool name="def_bluetooth_on">true</bool> <bool name="def_wifi_display_on">false</bool> <bool name="def_install_non_market_apps">false</bool> - <bool name="def_package_verifier_enable">true</bool> <!-- 0 == off, 3 == on --> <integer name="def_location_mode">3</integer> <bool name="assisted_gps_enabled">true</bool> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 0c4db4974024..202734566903 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1191,19 +1191,7 @@ class DatabaseHelper extends SQLiteOpenHelper { } if (upgradeVersion == 81) { - // Add package verification setting - db.beginTransaction(); - SQLiteStatement stmt = null; - try { - stmt = db.compileStatement("INSERT OR REPLACE INTO secure(name,value)" - + " VALUES(?,?);"); - loadBooleanSetting(stmt, Settings.Global.PACKAGE_VERIFIER_ENABLE, - R.bool.def_package_verifier_enable); - db.setTransactionSuccessful(); - } finally { - db.endTransaction(); - if (stmt != null) stmt.close(); - } + // package_verifier_enable has been removed upgradeVersion = 82; } @@ -1305,7 +1293,6 @@ class DatabaseHelper extends SQLiteOpenHelper { db.beginTransaction(); try { String[] settingsToMove = { - Settings.Global.PACKAGE_VERIFIER_ENABLE, Settings.Global.PACKAGE_VERIFIER_TIMEOUT, Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE }; @@ -2470,9 +2457,6 @@ class DatabaseHelper extends SQLiteOpenHelper { loadDefaultAnimationSettings(stmt); // --- Previously in 'secure' - loadBooleanSetting(stmt, Settings.Global.PACKAGE_VERIFIER_ENABLE, - R.bool.def_package_verifier_enable); - loadBooleanSetting(stmt, Settings.Global.WIFI_ON, R.bool.def_wifi_on); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 55a51dab3f28..9f3855201150 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1162,9 +1162,6 @@ class SettingsProtoDumpUtil { final long pkgVerifierToken = p.start(GlobalSettingsProto.PACKAGE_VERIFIER); dumpSetting(s, p, - Settings.Global.PACKAGE_VERIFIER_ENABLE, - GlobalSettingsProto.PackageVerifier.ENABLED); - dumpSetting(s, p, Settings.Global.PACKAGE_VERIFIER_TIMEOUT, GlobalSettingsProto.PackageVerifier.TIMEOUT); dumpSetting(s, p, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index f5d1ccfe378b..e1be9922a2b6 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -959,11 +959,6 @@ public class SettingsProvider extends ContentProvider { final long identity = Binder.clearCallingIdentity(); try { synchronized (mLock) { - Setting enable = getGlobalSetting( - Settings.Global.PACKAGE_VERIFIER_ENABLE); - String enableValue = enable != null ? enable.getValue() : null; - updateGlobalSetting(Settings.Global.PACKAGE_VERIFIER_ENABLE, - enableValue, null, true, userId, true); Setting include = getGlobalSetting( Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB); String includeValue = include != null ? include.getValue() : null; diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 289ac802ccb0..3be34f0b889e 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -387,7 +387,6 @@ public class SettingsBackupTest { Settings.Global.OVERLAY_DISPLAY_DEVICES, Settings.Global.PAC_CHANGE_DELAY, Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE, - Settings.Global.PACKAGE_VERIFIER_ENABLE, Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, Settings.Global.PACKAGE_VERIFIER_TIMEOUT, diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java index 3be51c58798e..1ab48de5fb9f 100644 --- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java +++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java @@ -569,10 +569,6 @@ public class UserRestrictionsUtils { if (newValue) { android.provider.Settings.Global.putStringForUser( context.getContentResolver(), - android.provider.Settings.Global.PACKAGE_VERIFIER_ENABLE, "1", - userId); - android.provider.Settings.Global.putStringForUser( - context.getContentResolver(), android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, "1", userId); } @@ -708,7 +704,6 @@ public class UserRestrictionsUtils { restriction = UserManager.DISALLOW_DEBUGGING_FEATURES; break; - case android.provider.Settings.Global.PACKAGE_VERIFIER_ENABLE: case android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB: if ("1".equals(value)) { return false; diff --git a/services/core/java/com/android/server/testharness/TestHarnessModeService.java b/services/core/java/com/android/server/testharness/TestHarnessModeService.java index fcf87ee2a4b8..778683369de5 100644 --- a/services/core/java/com/android/server/testharness/TestHarnessModeService.java +++ b/services/core/java/com/android/server/testharness/TestHarnessModeService.java @@ -165,7 +165,7 @@ public class TestHarnessModeService extends SystemService { Settings.Global.putLong(cr, Settings.Global.ADB_ALLOWED_CONNECTION_TIME, 0); Settings.Global.putInt(cr, Settings.Global.ADB_ENABLED, 1); Settings.Global.putInt(cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1); - Settings.Global.putInt(cr, Settings.Global.PACKAGE_VERIFIER_ENABLE, 0); + Settings.Global.putInt(cr, Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 0); Settings.Global.putInt( cr, Settings.Global.STAY_ON_WHILE_PLUGGED_IN, |