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

Commit db756664 authored by Alex Klyubin's avatar Alex Klyubin
Browse files

Remove unused ro.com.android.wifi-watchlist 

System property ro.com.android.wifi-watchlist is automatically copied
into Settings.Secure.WIFI_WATCHDOG_WATCH_LIST which has been
deprecated and unused since API Level 16 (if not 14). Neither the
system property not its Settings.Secure counterpart is used anywhere.

This commit thus removes the automatic copying of the system property
into Settings.Secure.

Test: Device boots, Wi-Fi works
Bug: 33700679
Change-Id: If27149b863f41fed6c09b62145d5cfd96ae8e6de
parent 3a8eac54

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