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

Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata

Browse Source 
Change-Id: I91c0d6be76030117ed3cf6d6d5f7514b4d4802ad
This commit is contained in:
Ihab Awad
2014-07-18 15:53:17 -07:00
parent 8f8141e24f
commit 7522bbd652
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

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

8
telecomm/java/android/telecomm/PhoneAccount.java
View File

@@ -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.
* <p>
* 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;

7
telecomm/java/android/telecomm/PhoneAccountMetadata.java
View File

@@ -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.
* <p>
* 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;