Merge "Revert "Public EuiccManager APIs."" (b6276fe5) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −44

Original line number	Diff line number	Diff line
		@@ -6705,7 +6705,6 @@ package android.app.admin {
		field public static final int USER_OPERATION_ERROR_MAX_RUNNING_USERS = 3; // 0x3
		field public static final int USER_OPERATION_ERROR_UNKNOWN = 1; // 0x1
		field public static final int USER_OPERATION_SUCCESS = 0; // 0x0
		field public static final int WIPE_EUICC = 4; // 0x4
		field public static final int WIPE_EXTERNAL_STORAGE = 1; // 0x1
		field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2
		}
		@@ -9441,7 +9440,6 @@ package android.content {
		field public static final java.lang.String DISPLAY_SERVICE = "display";
		field public static final java.lang.String DOWNLOAD_SERVICE = "download";
		field public static final java.lang.String DROPBOX_SERVICE = "dropbox";
		field public static final java.lang.String EUICC_SERVICE = "euicc";
		field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";
		field public static final java.lang.String HARDWARE_PROPERTIES_SERVICE = "hardware_properties";
		field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";
		@@ -11267,7 +11265,6 @@ package android.content.pm {
		field public static final java.lang.String FEATURE_STRONGBOX_KEYSTORE = "android.hardware.strongbox_keystore";
		field public static final java.lang.String FEATURE_TELEPHONY = "android.hardware.telephony";
		field public static final java.lang.String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";
		field public static final java.lang.String FEATURE_TELEPHONY_EUICC = "android.hardware.telephony.euicc";
		field public static final java.lang.String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";
		field public static final java.lang.String FEATURE_TELEPHONY_MBMS = "android.hardware.telephony.mbms";
		field public static final deprecated java.lang.String FEATURE_TELEVISION = "android.hardware.type.television";
		@@ -42200,16 +42197,13 @@ package android.telephony {
		method public java.lang.String getNumber();
		method public int getSimSlotIndex();
		method public int getSubscriptionId();
		method public boolean isEmbedded();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telephony.SubscriptionInfo> CREATOR;
		}

		public class SubscriptionManager {
		method public void addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
		method public boolean canManageSubscription(android.telephony.SubscriptionInfo);
		method public static deprecated android.telephony.SubscriptionManager from(android.content.Context);
		method public java.util.List<android.telephony.SubscriptionInfo> getAccessibleSubscriptionInfoList();
		method public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);
		method public int getActiveSubscriptionInfoCount();
		method public int getActiveSubscriptionInfoCountMax();
		@@ -42594,44 +42588,6 @@ package android.telephony.data {

		}

		package android.telephony.euicc {

		public final class DownloadableSubscription implements android.os.Parcelable {
		method public int describeContents();
		method public static android.telephony.euicc.DownloadableSubscription forActivationCode(java.lang.String);
		method public java.lang.String getConfirmationCode();
		method public java.lang.String getEncodedActivationCode();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telephony.euicc.DownloadableSubscription> CREATOR;
		}

		public final class EuiccInfo implements android.os.Parcelable {
		ctor public EuiccInfo(java.lang.String);
		method public int describeContents();
		method public java.lang.String getOsVersion();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telephony.euicc.EuiccInfo> CREATOR;
		}

		public class EuiccManager {
		method public void deleteSubscription(int, android.app.PendingIntent);
		method public void downloadSubscription(android.telephony.euicc.DownloadableSubscription, boolean, android.app.PendingIntent);
		method public java.lang.String getEid();
		method public android.telephony.euicc.EuiccInfo getEuiccInfo();
		method public boolean isEnabled();
		method public void startResolutionActivity(android.app.Activity, int, android.content.Intent, android.app.PendingIntent) throws android.content.IntentSender.SendIntentException;
		method public void switchToSubscription(int, android.app.PendingIntent);
		field public static final java.lang.String ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS = "android.telephony.euicc.action.MANAGE_EMBEDDED_SUBSCRIPTIONS";
		field public static final java.lang.String ACTION_NOTIFY_CARRIER_SETUP_INCOMPLETE = "android.telephony.euicc.action.NOTIFY_CARRIER_SETUP_INCOMPLETE";
		field public static final int EMBEDDED_SUBSCRIPTION_RESULT_ERROR = 2; // 0x2
		field public static final int EMBEDDED_SUBSCRIPTION_RESULT_OK = 0; // 0x0
		field public static final int EMBEDDED_SUBSCRIPTION_RESULT_RESOLVABLE_ERROR = 1; // 0x1
		field public static final java.lang.String EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE = "android.telephony.euicc.extra.EMBEDDED_SUBSCRIPTION_DETAILED_CODE";
		field public static final java.lang.String META_DATA_CARRIER_ICON = "android.telephony.euicc.carriericon";
		}

		}

		package android.telephony.gsm {

		public class GsmCellLocation extends android.telephony.CellLocation {

api/system-current.txt

+1 −258

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/admin/DevicePolicyManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -3444,6 +3444,9 @@ public class DevicePolicyManager {

		/**
		* Flag for {@link #wipeData(int)}: also erase the device's eUICC data.
		*
		* TODO(b/35851809): make this public.
		* @hide
		*/
		public static final int WIPE_EUICC = 0x0004;

core/java/android/content/Context.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -3671,8 +3671,10 @@ public abstract class Context {
		*
		* @see #getSystemService(String)
		* @see android.telephony.euicc.EuiccManager
		* TODO(b/35851809): Unhide this API.
		* @hide
		*/
		public static final String EUICC_SERVICE = "euicc";
		public static final String EUICC_SERVICE = "euicc_service";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a
		@@ -3680,10 +3682,10 @@ public abstract class Context {
		*
		* @see #getSystemService(String)
		* @see android.telephony.euicc.EuiccCardManager
		* TODO(b/35851809): Make this a SystemApi.
		* @hide
		*/
		@SystemApi
		public static final String EUICC_CARD_SERVICE = "euicc_card";
		public static final String EUICC_CARD_SERVICE = "euicc_card_service";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a

core/java/android/content/pm/PackageManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -2108,6 +2108,8 @@ public abstract class PackageManager {
		/**
		* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device
		* supports embedded subscriptions on eUICCs.
		* TODO(b/35851809): Make this public.
		* @hide
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_TELEPHONY_EUICC = "android.hardware.telephony.euicc";