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

Commit 79046ce0 authored by Stephen Chen's avatar Stephen Chen Committed by android-build-merger
Browse files

Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am:... 

Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4 am: 45fdf320 am: e70ef235
am: 70889ff6

Change-Id: If076123dc3874615b058bbddfd3c4810f54b303d
parents 877ab7f9 70889ff6

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35650,6 +35650,7 @@ package android.provider { 
    field public static final deprecated 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";

    field public static final java.lang.String NETWORK_RECOMMENDATIONS_ENABLED = "network_recommendations_enabled";

    field public static final java.lang.String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update";

    field public static final java.lang.String RADIO_BLUETOOTH = "bluetooth";

    field public static final java.lang.String RADIO_CELL = "cell";

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -7762,6 +7762,15 @@ public final class Settings { 
        @SystemApi

        public static final String WIFI_WAKEUP_ENABLED = "wifi_wakeup_enabled";



        /**

         * Value to specify if network recommendations from

         * {@link com.android.server.NetworkScoreService} are enabled.

         * @hide

         */

        @SystemApi

        public static final String NETWORK_RECOMMENDATIONS_ENABLED =

                "network_recommendations_enabled";



       /**

        * Settings to allow BLE scans to be enabled even when Bluetooth is turned off for

        * connectivity.