diff --git a/api/current.txt b/api/current.txt index 993b065fb0fa1..071782694aee8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28498,7 +28498,6 @@ package android.telecomm { method public android.content.ComponentName getComponentName(); method public java.lang.String getId(); method public void writeToParcel(android.os.Parcel, int); - field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4 field public static final android.os.Parcelable.Creator CREATOR; } @@ -28516,6 +28515,7 @@ package android.telecomm { method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2 field public static final int CAPABILITY_SIM_CALL_MANAGER = 1; // 0x1 + field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4 field public static final android.os.Parcelable.Creator CREATOR; } diff --git a/telecomm/java/android/telecomm/PhoneAccount.java b/telecomm/java/android/telecomm/PhoneAccount.java index bb335c377b35a..edfd846e36863 100644 --- a/telecomm/java/android/telecomm/PhoneAccount.java +++ b/telecomm/java/android/telecomm/PhoneAccount.java @@ -33,14 +33,6 @@ import java.util.Objects; * PhoneAccountMetadata. */ public class PhoneAccount implements Parcelable { - - /** - * Flag indicating that this {@code PhoneAccount} represents built-in PSTN SIM subscription. - *
- * Only the android framework can set this capability on a phone account. - */ - public static final int CAPABILITY_SIM_SUBSCRIPTION = 0x4; - private ComponentName mComponentName; private String mId; diff --git a/telecomm/java/android/telecomm/PhoneAccountMetadata.java b/telecomm/java/android/telecomm/PhoneAccountMetadata.java index e5e41ff77ba81..899317095ecbf 100644 --- a/telecomm/java/android/telecomm/PhoneAccountMetadata.java +++ b/telecomm/java/android/telecomm/PhoneAccountMetadata.java @@ -57,6 +57,13 @@ public class PhoneAccountMetadata implements Parcelable { */ public static final int CAPABILITY_CALL_PROVIDER = 0x2; + /** + * Flag indicating that this {@code PhoneAccount} represents built-in PSTN SIM subscription. + *
+ * Only the android framework can set this capability on a phone account. + */ + public static final int CAPABILITY_SIM_SUBSCRIPTION = 0x4; + private final PhoneAccount mAccount; private final Uri mHandle; private final int mCapabilities;