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

Commit 60e0644d authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

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

am: a2503082

* commit 'a2503082':
  Add a Settings option of "Disable automatic update".
parents 268b3264 a2503082

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34700,6 +34700,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 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";

    field public static final java.lang.String RADIO_NFC = "nfc";

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -6742,6 +6742,16 @@ public final class Settings { 
       /** {@hide} */

       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

        * review apps prior to installation.