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

Commit a64db133 authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun Committed by android-build-merger
Browse files

Merge "Mark EUICC_PROVISIONED as @SystemApi." am: 4b5680b6 

am: 41fa5ff1

Change-Id: Ie737a298f1ab342d571e150be452a9590e623052
parents 92697692 41fa5ff1

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3532,6 +3532,7 @@ package android.provider { 
    method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String, boolean);

    method public static void resetToDefaults(android.content.ContentResolver, java.lang.String);

    field public static final java.lang.String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";

    field public static final java.lang.String EUICC_PROVISIONED = "euicc_provisioned";

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

    field public static final java.lang.String THEATER_MODE_ON = "theater_mode_on";

    field public static final java.lang.String WEBVIEW_MULTIPROCESS = "webview_multiprocess";

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -7869,6 +7869,7 @@ public final class Settings { 
         * (0 = false, 1 = true)

         * @hide

         */

        @SystemApi

        public static final String EUICC_PROVISIONED = "euicc_provisioned";



        /**