Merge "Remove unused ro.com.android.wifi-watchlist" (4799fce7) · Commits · e / os / android_frameworks_base

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -446,20 +446,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
		}

		if (upgradeVersion == 32) {
		// The Wi-Fi watchdog SSID list is now seeded with the value of
		// the property ro.com.android.wifi-watchlist
		String wifiWatchList = SystemProperties.get("ro.com.android.wifi-watchlist");
		if (!TextUtils.isEmpty(wifiWatchList)) {
		db.beginTransaction();
		try {
		db.execSQL("INSERT OR IGNORE INTO secure(name,value) values('" +
		Settings.Secure.WIFI_WATCHDOG_WATCH_LIST + "','" +
		wifiWatchList + "');");
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		}
		}
		upgradeVersion = 33;
		}

		@@ -2435,11 +2421,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
		loadStringSetting(stmt, Settings.Secure.LOCATION_PROVIDERS_ALLOWED,
		R.string.def_location_providers_allowed);

		String wifiWatchList = SystemProperties.get("ro.com.android.wifi-watchlist");
		if (!TextUtils.isEmpty(wifiWatchList)) {
		loadSetting(stmt, Settings.Secure.WIFI_WATCHDOG_WATCH_LIST, wifiWatchList);
		}

		// Don't do this. The SystemServer will initialize ADB_ENABLED from a
		// persistent system property instead.
		//loadSetting(stmt, Settings.Secure.ADB_ENABLED, 0);