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

Commit 835db7f6 authored by Amin Shaikh's avatar Amin Shaikh Committed by android-build-merger
Browse files

Merge "Add Setting for curating saved open networks." am: b3b665de 

am: 2aec2f7a

Change-Id: If61be9f8e71bb89a8714c3f4a5eb10b04982cdf7
parents 46f036c6 2aec2f7a

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35483,6 +35483,7 @@ package android.provider { 
    field public static final java.lang.String BOOT_COUNT = "boot_count";

    field public static final java.lang.String CONTACT_METADATA_SYNC_ENABLED = "contact_metadata_sync_enabled";

    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String CURATE_SAVED_OPEN_NETWORKS = "curate_saved_open_networks";

    field public static final java.lang.String DATA_ROAMING = "data_roaming";

    field public static final java.lang.String DEBUG_APP = "debug_app";

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

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -7671,6 +7671,16 @@ public final class Settings { 
        public static final String NETWORK_RECOMMENDATIONS_ENABLED =

                "network_recommendations_enabled";



        /**

         * Value to specify if the Wi-Fi Framework should defer to

         * {@link com.android.server.NetworkScoreService} for evaluating saved open networks.

         *

         * Type: int (0 for false, 1 for true)

         * @hide

         */

        @SystemApi

        public static final String CURATE_SAVED_OPEN_NETWORKS = "curate_saved_open_networks";



        /**

         * The number of milliseconds the {@link com.android.server.NetworkScoreService}

         * will give a recommendation request to complete before returning a default response.