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

Commit ae1af49a authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev 

* commit '3a8af8ef':
  Migrate more Secure settings to Global.
parents a7346d20 3a8af8ef

api/current.txt

+8 −7
Original line number Diff line number Diff line
@@ -18816,6 +18816,7 @@ package android.provider { 
    field public static final java.lang.String DATA_ROAMING = "data_roaming";

    field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";

    field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";

    field public static final java.lang.String HTTP_PROXY = "http_proxy";

    field public static final java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

    field public static final java.lang.String MODE_RINGER = "mode_ringer";

    field public static final java.lang.String NETWORK_PREFERENCE = "network_preference";
@@ -18879,7 +18880,7 @@ package android.provider { 
    field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned";

    field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services";

    field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods";

    field public static final java.lang.String HTTP_PROXY = "http_proxy";

    field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";

    field public static final java.lang.String INPUT_METHOD_SELECTOR_VISIBILITY = "input_method_selector_visibility";

    field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

    field public static final java.lang.String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
@@ -19038,12 +19039,12 @@ package android.provider { 
    field public static final deprecated int WIFI_SLEEP_POLICY_DEFAULT = 0; // 0x0

    field public static final deprecated int WIFI_SLEEP_POLICY_NEVER = 2; // 0x2

    field public static final deprecated int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED = 1; // 0x1

    field public static final java.lang.String WIFI_STATIC_DNS1 = "wifi_static_dns1";

    field public static final java.lang.String WIFI_STATIC_DNS2 = "wifi_static_dns2";

    field public static final java.lang.String WIFI_STATIC_GATEWAY = "wifi_static_gateway";

    field public static final java.lang.String WIFI_STATIC_IP = "wifi_static_ip";

    field public static final java.lang.String WIFI_STATIC_NETMASK = "wifi_static_netmask";

    field public static final java.lang.String WIFI_USE_STATIC_IP = "wifi_use_static_ip";

    field public static final deprecated java.lang.String WIFI_STATIC_DNS1 = "wifi_static_dns1";

    field public static final deprecated java.lang.String WIFI_STATIC_DNS2 = "wifi_static_dns2";

    field public static final deprecated java.lang.String WIFI_STATIC_GATEWAY = "wifi_static_gateway";

    field public static final deprecated java.lang.String WIFI_STATIC_IP = "wifi_static_ip";

    field public static final deprecated java.lang.String WIFI_STATIC_NETMASK = "wifi_static_netmask";

    field public static final deprecated java.lang.String WIFI_USE_STATIC_IP = "wifi_use_static_ip";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE = "wifi_watchdog_acceptable_packet_loss_percentage";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_AP_COUNT = "wifi_watchdog_ap_count";

    field public static final deprecated java.lang.String WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS = "wifi_watchdog_background_check_delay_ms";

core/java/android/app/ApplicationErrorReport.java

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ public class ApplicationErrorReport implements Parcelable { 
    public static ComponentName getErrorReportReceiver(Context context,

            String packageName, int appFlags) {

        // check if error reporting is enabled in secure settings

        int enabled = Settings.Secure.getInt(context.getContentResolver(),

                Settings.Secure.SEND_ACTION_APP_ERROR, 0);

        int enabled = Settings.Global.getInt(context.getContentResolver(),

                Settings.Global.SEND_ACTION_APP_ERROR, 0);

        if (enabled == 0) {

            return null;

        }

core/java/android/content/SyncManager.java

+2 −2
Original line number Diff line number Diff line
@@ -777,8 +777,8 @@ public class SyncManager implements OnAccountsUpdateListener { 
        }



        // Cap the delay

        long maxSyncRetryTimeInSeconds = Settings.Secure.getLong(mContext.getContentResolver(),

                Settings.Secure.SYNC_MAX_RETRY_DELAY_IN_SECONDS,

        long maxSyncRetryTimeInSeconds = Settings.Global.getLong(mContext.getContentResolver(),

                Settings.Global.SYNC_MAX_RETRY_DELAY_IN_SECONDS,

                DEFAULT_MAX_SYNC_RETRY_TIME_IN_SECONDS);

        if (newDelayInMs > maxSyncRetryTimeInSeconds * 1000) {

            newDelayInMs = maxSyncRetryTimeInSeconds * 1000;

core/java/android/net/CaptivePortalTracker.java

+4 −4
Original line number Diff line number Diff line
@@ -89,12 +89,12 @@ public class CaptivePortalTracker extends StateMachine { 
        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

        mContext.registerReceiver(mReceiver, filter);



        mServer = Settings.Secure.getString(mContext.getContentResolver(),

                Settings.Secure.CAPTIVE_PORTAL_SERVER);

        mServer = Settings.Global.getString(mContext.getContentResolver(),

                Settings.Global.CAPTIVE_PORTAL_SERVER);

        if (mServer == null) mServer = DEFAULT_SERVER;



        mIsCaptivePortalCheckEnabled = Settings.Secure.getInt(mContext.getContentResolver(),

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

        mIsCaptivePortalCheckEnabled = Settings.Global.getInt(mContext.getContentResolver(),

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



        addState(mDefaultState);

            addState(mNoActiveNetworkState, mDefaultState);

core/java/android/net/ConnectivityManager.java

+8 −0
Original line number Diff line number Diff line
@@ -330,6 +330,14 @@ public class ConnectivityManager { 


    public static final int DEFAULT_NETWORK_PREFERENCE = TYPE_WIFI;



    /**

     * Default value for {@link Settings.Global#CONNECTIVITY_CHANGE_DELAY} in

     * milliseconds.

     *

     * @hide

     */

    public static final int CONNECTIVITY_CHANGE_DELAY_DEFAULT = 3000;



    private final IConnectivityManager mService;



    public static boolean isNetworkTypeValid(int networkType) {