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

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

Browse Source 
am: 41fa5ff101

Change-Id: Ie737a298f1ab342d571e150be452a9590e623052
This commit is contained in:
Holly Jiuyu Sun
2018-02-28 20:38:13 +00:00
committed by android-build-merger
parent 92697692b3 41fa5ff101
commit a64db1336d
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -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";

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

@@ -7869,6 +7869,7 @@ public final class Settings {
* (0 = false, 1 = true)
* @hide
*/
@SystemApi
public static final String EUICC_PROVISIONED = "euicc_provisioned";
/**