diff options
| author | 2017-04-17 19:02:58 +0000 | |
|---|---|---|
| committer | 2017-04-17 19:03:03 +0000 | |
| commit | 5b06dbd12bcd28fbc051c88c3ea7f31bcf20d1f8 (patch) | |
| tree | a820e7432b2cf615bc78dcf177646aae4b3d2ea1 | |
| parent | befd33975c2f57a541b62668e4d9976e149db73b (diff) | |
| parent | 509352d475ddb120249f5b0626ff9071d20c22dc (diff) | |
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 21fce319ebe9..303a607b383c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -38136,7 +38136,6 @@ 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"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 539559d19c82..c6ea9586374d 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8330,7 +8330,6 @@ public final class Settings { * enabled state. * @hide */ - @SystemApi public static final String NETWORK_RECOMMENDATIONS_ENABLED = "network_recommendations_enabled"; |