Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a Settings option of "Disable automatic update"." into nyc-dev

Browse Source 
am: c86f234c51

* commit 'c86f234c51ebcb78164d850177eb2143112f9f65':
  Add a Settings option of "Disable automatic update".
This commit is contained in:
Tao Bao
2016-02-17 20:09:51 +00:00
committed by android-build-merger
parent 4056266ad8 c86f234c51
commit a250308200
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -34695,6 +34695,7 @@ package android.provider {
field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps"; 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 MODE_RINGER = "mode_ringer";
field public static final java.lang.String NETWORK_PREFERENCE = "network_preference"; field public static final java.lang.String NETWORK_PREFERENCE = "network_preference";
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_BLUETOOTH = "bluetooth";
field public static final java.lang.String RADIO_CELL = "cell"; field public static final java.lang.String RADIO_CELL = "cell";
field public static final java.lang.String RADIO_NFC = "nfc"; field public static final java.lang.String RADIO_NFC = "nfc";

10
core/java/android/provider/Settings.java
View File

@@ -6730,6 +6730,16 @@ public final class Settings {
/** {@hide} */ /** {@hide} */
public static final String STORAGE_BENCHMARK_INTERVAL = "storage_benchmark_interval"; public static final String STORAGE_BENCHMARK_INTERVAL = "storage_benchmark_interval";
/**
* Whether to disable the automatic scheduling of system updates.
* 1 = system updates won't be automatically scheduled (will always
* present notification instead).
* 0 = system updates will be automatically scheduled. (default)
* @hide
*/
@SystemApi
public static final String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update";
/** /**
* Whether the package manager should send package verification broadcasts for verifiers to * Whether the package manager should send package verification broadcasts for verifiers to
* review apps prior to installation. * review apps prior to installation.