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

Commit bdfce2ec authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

First step towards cleaning up Global settings. 

Remove all @Deprecated @hide settings, and clean up any stragglers.

Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
parent 51ce1607

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -18919,7 +18919,7 @@ package android.provider { 
    field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS = "wifi_watchdog_background_check_timeout_ms";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS = "wifi_watchdog_background_check_timeout_ms";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT = "wifi_watchdog_initial_ignored_ping_count";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT = "wifi_watchdog_initial_ignored_ping_count";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_MAX_AP_CHECKS = "wifi_watchdog_max_ap_checks";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_MAX_AP_CHECKS = "wifi_watchdog_max_ap_checks";

    field public static final java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_COUNT = "wifi_watchdog_ping_count";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_DELAY_MS = "wifi_watchdog_ping_delay_ms";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_PING_TIMEOUT_MS = "wifi_watchdog_ping_timeout_ms";

core/java/android/provider/Settings.java

+4 −560

File changed.

Preview size limit exceeded, changes collapsed.

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

+8 −8
Original line number Original line Diff line number Diff line
@@ -472,7 +472,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                String value =

                String value =

                        mContext.getResources().getBoolean(R.bool.assisted_gps_enabled) ? "1" : "0";

                        mContext.getResources().getBoolean(R.bool.assisted_gps_enabled) ? "1" : "0";

                db.execSQL("INSERT OR IGNORE INTO secure(name,value) values('" +

                db.execSQL("INSERT OR IGNORE INTO secure(name,value) values('" +

                        Settings.Secure.ASSISTED_GPS_ENABLED + "','" + value + "');");

                        Settings.Global.ASSISTED_GPS_ENABLED + "','" + value + "');");

                db.setTransactionSuccessful();

                db.setTransactionSuccessful();

            } finally {

            } finally {

                db.endTransaction();

                db.endTransaction();
@@ -1190,7 +1190,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            try {

            try {

                stmt = db.compileStatement("INSERT OR REPLACE INTO secure(name,value)"

                stmt = db.compileStatement("INSERT OR REPLACE INTO secure(name,value)"

                        + " VALUES(?,?);");

                        + " VALUES(?,?);");

                loadBooleanSetting(stmt, Settings.Secure.PACKAGE_VERIFIER_ENABLE,

                loadBooleanSetting(stmt, Settings.Global.PACKAGE_VERIFIER_ENABLE,

                        R.bool.def_package_verifier_enable);

                        R.bool.def_package_verifier_enable);

                db.setTransactionSuccessful();

                db.setTransactionSuccessful();

            } finally {

            } finally {
@@ -1300,9 +1300,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                db.beginTransaction();

                db.beginTransaction();

                try {

                try {

                    String[] settingsToMove = {

                    String[] settingsToMove = {

                            Settings.Secure.PACKAGE_VERIFIER_ENABLE,

                            Settings.Global.PACKAGE_VERIFIER_ENABLE,

                            Settings.Secure.PACKAGE_VERIFIER_TIMEOUT,

                            Settings.Global.PACKAGE_VERIFIER_TIMEOUT,

                            Settings.Secure.PACKAGE_VERIFIER_DEFAULT_RESPONSE

                            Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE

                    };

                    };

                    moveSettingsToNewTable(db, TABLE_SECURE, TABLE_GLOBAL, settingsToMove, true);

                    moveSettingsToNewTable(db, TABLE_SECURE, TABLE_GLOBAL, settingsToMove, true);
@@ -1319,9 +1319,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                db.beginTransaction();

                db.beginTransaction();

                try {

                try {

                    String[] settingsToMove = {

                    String[] settingsToMove = {

                            Settings.Secure.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS,

                            Settings.Global.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS,

                            Settings.Secure.DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS,

                            Settings.Global.DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS,

                            Settings.Secure.GPRS_REGISTER_CHECK_PERIOD_MS

                            Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS

                    };

                    };

                    moveSettingsToNewTable(db, TABLE_SECURE, TABLE_GLOBAL, settingsToMove, true);

                    moveSettingsToNewTable(db, TABLE_SECURE, TABLE_GLOBAL, settingsToMove, true);

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

+88 −88
Original line number Original line Diff line number Diff line
@@ -110,94 +110,94 @@ public class SettingsProvider extends ContentProvider { 
        // table, shared across all users

        // table, shared across all users

        // These must match Settings.Secure.MOVED_TO_GLOBAL

        // These must match Settings.Secure.MOVED_TO_GLOBAL

        sSecureGlobalKeys = new HashSet<String>();

        sSecureGlobalKeys = new HashSet<String>();

        sSecureGlobalKeys.add(Settings.Secure.ADB_ENABLED);

        sSecureGlobalKeys.add(Settings.Global.ADB_ENABLED);

        sSecureGlobalKeys.add(Settings.Secure.ASSISTED_GPS_ENABLED);

        sSecureGlobalKeys.add(Settings.Global.ASSISTED_GPS_ENABLED);

        sSecureGlobalKeys.add(Settings.Secure.BLUETOOTH_ON);

        sSecureGlobalKeys.add(Settings.Global.BLUETOOTH_ON);

        sSecureGlobalKeys.add(Settings.Secure.CDMA_CELL_BROADCAST_SMS);

        sSecureGlobalKeys.add(Settings.Global.CDMA_CELL_BROADCAST_SMS);

        sSecureGlobalKeys.add(Settings.Secure.CDMA_ROAMING_MODE);

        sSecureGlobalKeys.add(Settings.Global.CDMA_ROAMING_MODE);

        sSecureGlobalKeys.add(Settings.Secure.CDMA_SUBSCRIPTION_MODE);

        sSecureGlobalKeys.add(Settings.Global.CDMA_SUBSCRIPTION_MODE);

        sSecureGlobalKeys.add(Settings.Secure.DATA_ACTIVITY_TIMEOUT_MOBILE);

        sSecureGlobalKeys.add(Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE);

        sSecureGlobalKeys.add(Settings.Secure.DATA_ACTIVITY_TIMEOUT_WIFI);

        sSecureGlobalKeys.add(Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI);

        sSecureGlobalKeys.add(Settings.Secure.DATA_ROAMING);

        sSecureGlobalKeys.add(Settings.Global.DATA_ROAMING);

        sSecureGlobalKeys.add(Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED);

        sSecureGlobalKeys.add(Settings.Global.DEVELOPMENT_SETTINGS_ENABLED);

        sSecureGlobalKeys.add(Settings.Secure.DEVICE_PROVISIONED);

        sSecureGlobalKeys.add(Settings.Global.DEVICE_PROVISIONED);

        sSecureGlobalKeys.add(Settings.Secure.DISPLAY_DENSITY_FORCED);

        sSecureGlobalKeys.add(Settings.Global.DISPLAY_DENSITY_FORCED);

        sSecureGlobalKeys.add(Settings.Secure.DISPLAY_SIZE_FORCED);

        sSecureGlobalKeys.add(Settings.Global.DISPLAY_SIZE_FORCED);

        sSecureGlobalKeys.add(Settings.Secure.DOWNLOAD_MAX_BYTES_OVER_MOBILE);

        sSecureGlobalKeys.add(Settings.Global.DOWNLOAD_MAX_BYTES_OVER_MOBILE);

        sSecureGlobalKeys.add(Settings.Secure.DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE);

        sSecureGlobalKeys.add(Settings.Global.DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE);

        sSecureGlobalKeys.add(Settings.Secure.INSTALL_NON_MARKET_APPS);

        sSecureGlobalKeys.add(Settings.Global.INSTALL_NON_MARKET_APPS);

        sSecureGlobalKeys.add(Settings.Secure.MOBILE_DATA);

        sSecureGlobalKeys.add(Settings.Global.MOBILE_DATA);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_DEV_BUCKET_DURATION);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_DEV_BUCKET_DURATION);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_DEV_DELETE_AGE);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_DEV_DELETE_AGE);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_DEV_PERSIST_BYTES);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_DEV_PERSIST_BYTES);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_DEV_ROTATE_AGE);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_DEV_ROTATE_AGE);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_ENABLED);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_ENABLED);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_GLOBAL_ALERT_BYTES);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_GLOBAL_ALERT_BYTES);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_POLL_INTERVAL);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_POLL_INTERVAL);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_REPORT_XT_OVER_DEV);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_REPORT_XT_OVER_DEV);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_SAMPLE_ENABLED);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_SAMPLE_ENABLED);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_TIME_CACHE_MAX_AGE);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_TIME_CACHE_MAX_AGE);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_UID_BUCKET_DURATION);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_BUCKET_DURATION);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_UID_DELETE_AGE);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_DELETE_AGE);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_UID_PERSIST_BYTES);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_PERSIST_BYTES);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_UID_ROTATE_AGE);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_ROTATE_AGE);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_UID_TAG_BUCKET_DURATION);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_TAG_BUCKET_DURATION);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_UID_TAG_DELETE_AGE);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_TAG_DELETE_AGE);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_UID_TAG_PERSIST_BYTES);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_TAG_PERSIST_BYTES);

        sSecureGlobalKeys.add(Settings.Secure.NETSTATS_UID_TAG_ROTATE_AGE);

        sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_TAG_ROTATE_AGE);

        sSecureGlobalKeys.add(Settings.Secure.NETWORK_PREFERENCE);

        sSecureGlobalKeys.add(Settings.Global.NETWORK_PREFERENCE);

        sSecureGlobalKeys.add(Settings.Secure.NITZ_UPDATE_DIFF);

        sSecureGlobalKeys.add(Settings.Global.NITZ_UPDATE_DIFF);

        sSecureGlobalKeys.add(Settings.Secure.NITZ_UPDATE_SPACING);

        sSecureGlobalKeys.add(Settings.Global.NITZ_UPDATE_SPACING);

        sSecureGlobalKeys.add(Settings.Secure.NTP_SERVER);

        sSecureGlobalKeys.add(Settings.Global.NTP_SERVER);

        sSecureGlobalKeys.add(Settings.Secure.NTP_TIMEOUT);

        sSecureGlobalKeys.add(Settings.Global.NTP_TIMEOUT);

        sSecureGlobalKeys.add(Settings.Secure.PDP_WATCHDOG_ERROR_POLL_COUNT);

        sSecureGlobalKeys.add(Settings.Global.PDP_WATCHDOG_ERROR_POLL_COUNT);

        sSecureGlobalKeys.add(Settings.Secure.PDP_WATCHDOG_LONG_POLL_INTERVAL_MS);

        sSecureGlobalKeys.add(Settings.Global.PDP_WATCHDOG_LONG_POLL_INTERVAL_MS);

        sSecureGlobalKeys.add(Settings.Secure.PDP_WATCHDOG_MAX_PDP_RESET_FAIL_COUNT);

        sSecureGlobalKeys.add(Settings.Global.PDP_WATCHDOG_MAX_PDP_RESET_FAIL_COUNT);

        sSecureGlobalKeys.add(Settings.Secure.PDP_WATCHDOG_POLL_INTERVAL_MS);

        sSecureGlobalKeys.add(Settings.Global.PDP_WATCHDOG_POLL_INTERVAL_MS);

        sSecureGlobalKeys.add(Settings.Secure.PDP_WATCHDOG_TRIGGER_PACKET_COUNT);

        sSecureGlobalKeys.add(Settings.Global.PDP_WATCHDOG_TRIGGER_PACKET_COUNT);

        sSecureGlobalKeys.add(Settings.Secure.SAMPLING_PROFILER_MS);

        sSecureGlobalKeys.add(Settings.Global.SAMPLING_PROFILER_MS);

        sSecureGlobalKeys.add(Settings.Secure.SETUP_PREPAID_DATA_SERVICE_URL);

        sSecureGlobalKeys.add(Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL);

        sSecureGlobalKeys.add(Settings.Secure.SETUP_PREPAID_DETECTION_REDIR_HOST);

        sSecureGlobalKeys.add(Settings.Global.SETUP_PREPAID_DETECTION_REDIR_HOST);

        sSecureGlobalKeys.add(Settings.Secure.SETUP_PREPAID_DETECTION_TARGET_URL);

        sSecureGlobalKeys.add(Settings.Global.SETUP_PREPAID_DETECTION_TARGET_URL);

        sSecureGlobalKeys.add(Settings.Secure.TETHER_DUN_APN);

        sSecureGlobalKeys.add(Settings.Global.TETHER_DUN_APN);

        sSecureGlobalKeys.add(Settings.Secure.TETHER_DUN_REQUIRED);

        sSecureGlobalKeys.add(Settings.Global.TETHER_DUN_REQUIRED);

        sSecureGlobalKeys.add(Settings.Secure.TETHER_SUPPORTED);

        sSecureGlobalKeys.add(Settings.Global.TETHER_SUPPORTED);

        sSecureGlobalKeys.add(Settings.Secure.THROTTLE_HELP_URI);

        sSecureGlobalKeys.add(Settings.Global.THROTTLE_HELP_URI);

        sSecureGlobalKeys.add(Settings.Secure.THROTTLE_MAX_NTP_CACHE_AGE_SEC);

        sSecureGlobalKeys.add(Settings.Global.THROTTLE_MAX_NTP_CACHE_AGE_SEC);

        sSecureGlobalKeys.add(Settings.Secure.THROTTLE_NOTIFICATION_TYPE);

        sSecureGlobalKeys.add(Settings.Global.THROTTLE_NOTIFICATION_TYPE);

        sSecureGlobalKeys.add(Settings.Secure.THROTTLE_POLLING_SEC);

        sSecureGlobalKeys.add(Settings.Global.THROTTLE_POLLING_SEC);

        sSecureGlobalKeys.add(Settings.Secure.THROTTLE_RESET_DAY);

        sSecureGlobalKeys.add(Settings.Global.THROTTLE_RESET_DAY);

        sSecureGlobalKeys.add(Settings.Secure.THROTTLE_THRESHOLD_BYTES);

        sSecureGlobalKeys.add(Settings.Global.THROTTLE_THRESHOLD_BYTES);

        sSecureGlobalKeys.add(Settings.Secure.THROTTLE_VALUE_KBITSPS);

        sSecureGlobalKeys.add(Settings.Global.THROTTLE_VALUE_KBITSPS);

        sSecureGlobalKeys.add(Settings.Secure.USB_MASS_STORAGE_ENABLED);

        sSecureGlobalKeys.add(Settings.Global.USB_MASS_STORAGE_ENABLED);

        sSecureGlobalKeys.add(Settings.Secure.USE_GOOGLE_MAIL);

        sSecureGlobalKeys.add(Settings.Global.USE_GOOGLE_MAIL);

        sSecureGlobalKeys.add(Settings.Secure.WEB_AUTOFILL_QUERY_URL);

        sSecureGlobalKeys.add(Settings.Global.WEB_AUTOFILL_QUERY_URL);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_COUNTRY_CODE);

        sSecureGlobalKeys.add(Settings.Global.WIFI_COUNTRY_CODE);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_FRAMEWORK_SCAN_INTERVAL_MS);

        sSecureGlobalKeys.add(Settings.Global.WIFI_FRAMEWORK_SCAN_INTERVAL_MS);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_FREQUENCY_BAND);

        sSecureGlobalKeys.add(Settings.Global.WIFI_FREQUENCY_BAND);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_IDLE_MS);

        sSecureGlobalKeys.add(Settings.Global.WIFI_IDLE_MS);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_MAX_DHCP_RETRY_COUNT);

        sSecureGlobalKeys.add(Settings.Global.WIFI_MAX_DHCP_RETRY_COUNT);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS);

        sSecureGlobalKeys.add(Settings.Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON);

        sSecureGlobalKeys.add(Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY);

        sSecureGlobalKeys.add(Settings.Global.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_NUM_OPEN_NETWORKS_KEPT);

        sSecureGlobalKeys.add(Settings.Global.WIFI_NUM_OPEN_NETWORKS_KEPT);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_ON);

        sSecureGlobalKeys.add(Settings.Global.WIFI_ON);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_P2P_DEVICE_NAME);

        sSecureGlobalKeys.add(Settings.Global.WIFI_P2P_DEVICE_NAME);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_SAVED_STATE);

        sSecureGlobalKeys.add(Settings.Global.WIFI_SAVED_STATE);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_SUPPLICANT_SCAN_INTERVAL_MS);

        sSecureGlobalKeys.add(Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED);

        sSecureGlobalKeys.add(Settings.Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_WATCHDOG_NUM_ARP_PINGS);

        sSecureGlobalKeys.add(Settings.Global.WIFI_WATCHDOG_NUM_ARP_PINGS);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_WATCHDOG_ON);

        sSecureGlobalKeys.add(Settings.Global.WIFI_WATCHDOG_ON);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED);

        sSecureGlobalKeys.add(Settings.Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED);

        sSecureGlobalKeys.add(Settings.Secure.WIFI_WATCHDOG_RSSI_FETCH_INTERVAL_MS);

        sSecureGlobalKeys.add(Settings.Global.WIFI_WATCHDOG_RSSI_FETCH_INTERVAL_MS);

        sSecureGlobalKeys.add(Settings.Secure.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON);

        sSecureGlobalKeys.add(Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON);

        sSecureGlobalKeys.add(Settings.Secure.PACKAGE_VERIFIER_ENABLE);

        sSecureGlobalKeys.add(Settings.Global.PACKAGE_VERIFIER_ENABLE);

        sSecureGlobalKeys.add(Settings.Secure.PACKAGE_VERIFIER_TIMEOUT);

        sSecureGlobalKeys.add(Settings.Global.PACKAGE_VERIFIER_TIMEOUT);

        sSecureGlobalKeys.add(Settings.Secure.PACKAGE_VERIFIER_DEFAULT_RESPONSE);

        sSecureGlobalKeys.add(Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE);

        sSecureGlobalKeys.add(Settings.Secure.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS);

        sSecureGlobalKeys.add(Settings.Global.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS);

        sSecureGlobalKeys.add(Settings.Secure.DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS);

        sSecureGlobalKeys.add(Settings.Global.DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS);

        sSecureGlobalKeys.add(Settings.Secure.GPRS_REGISTER_CHECK_PERIOD_MS);

        sSecureGlobalKeys.add(Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS);

        sSecureGlobalKeys.add(Settings.Secure.WTF_IS_FATAL);

        sSecureGlobalKeys.add(Settings.Global.WTF_IS_FATAL);





        // Keys from the 'system' table now moved to 'global'

        // Keys from the 'system' table now moved to 'global'

        // These must match Settings.System.MOVED_TO_GLOBAL

        // These must match Settings.System.MOVED_TO_GLOBAL

services/java/com/android/server/ConnectivityService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1509,8 +1509,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        //       which is where we store the value and maybe make this

        //       which is where we store the value and maybe make this

        //       asynchronous.

        //       asynchronous.

        enforceAccessPermission();

        enforceAccessPermission();

        boolean retVal = Settings.Secure.getInt(mContext.getContentResolver(),

        boolean retVal = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Secure.MOBILE_DATA, 1) == 1;

                Settings.Global.MOBILE_DATA, 1) == 1;

        if (VDBG) log("getMobileDataEnabled returning " + retVal);

        if (VDBG) log("getMobileDataEnabled returning " + retVal);

        return retVal;

        return retVal;

    }

    }