Merge "Delete PACKAGE_VERIFIER_ENABLE setting." (a5ca0cc2) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -4952,7 +4952,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);
		@@ -9283,16 +9282,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";

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>

+1 −17

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -1161,9 +1161,6 @@ class SettingsProtoDumpUtil {
		GlobalSettingsProto.PAC_CHANGE_DELAY);

		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);

+0 −5

Original line number	Diff line number	Diff line
		@@ -967,11 +967,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;