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

Commit 3840f33e authored by Ihab Awad's avatar Ihab Awad Committed by Android (Google) Code Review
Browse files

Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev

parents cbaecd0f 7522bbd6

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -28498,7 +28498,6 @@ package android.telecomm { 
    method public android.content.ComponentName getComponentName();

    method public android.content.ComponentName getComponentName();

    method public java.lang.String getId();

    method public java.lang.String getId();

    method public void writeToParcel(android.os.Parcel, int);

    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;

    field public static final android.os.Parcelable.Creator CREATOR;

  }

  }















@@ -28516,6 +28515,7 @@ package android.telecomm {









    method public void writeToParcel(android.os.Parcel, int);







    method public void writeToParcel(android.os.Parcel, int);











    field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2







    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_CALL_MANAGER = 1; // 0x1














    field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4











    field public static final android.os.Parcelable.Creator CREATOR;







    field public static final android.os.Parcelable.Creator CREATOR;











  }







  }









































telecomm/java/android/telecomm/PhoneAccount.java



+0
−8




























Original line number
Original line
Diff line number
Diff line








@@ -33,14 +33,6 @@ import java.util.Objects;









 * PhoneAccountMetadata.







 * PhoneAccountMetadata.











 */







 */











public class PhoneAccount implements Parcelable {







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 ComponentName mComponentName;











    private String mId;







    private String mId;





















































telecomm/java/android/telecomm/PhoneAccountMetadata.java



+7
−0




























Original line number
Original line
Diff line number
Diff line








@@ -57,6 +57,13 @@ public class PhoneAccountMetadata implements Parcelable {









     */







     */











    public static final int CAPABILITY_CALL_PROVIDER = 0x2;







    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 PhoneAccount mAccount;











    private final Uri mHandle;







    private final Uri mHandle;











    private final int mCapabilities;







    private final int mCapabilities;