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

Commit a6f8e92f authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Add intdef to subscription info record methods" am: 5ddd0bf6 am: acf465e7 am: de55c1ff 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1998850

Change-Id: If9003c519ff66d39c6394e2c3d5f6aa00373097a
parents ba4caf4d de55c1ff

telephony/java/android/telephony/SubscriptionManager.java

+3 −2
Original line number Diff line number Diff line
@@ -1976,7 +1976,7 @@ public class SubscriptionManager { 
     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public void addSubscriptionInfoRecord(@NonNull String uniqueId, @Nullable String displayName,

            int slotIndex, int subscriptionType) {

            int slotIndex, @SubscriptionType int subscriptionType) {

        if (VDBG) {

            logd("[addSubscriptionInfoRecord]+ uniqueId:" + uniqueId

                    + ", displayName:" + displayName + ", slotIndex:" + slotIndex
@@ -2012,7 +2012,8 @@ public class SubscriptionManager { 
     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public void removeSubscriptionInfoRecord(@NonNull String uniqueId, int subscriptionType) {

    public void removeSubscriptionInfoRecord(@NonNull String uniqueId,

            @SubscriptionType int subscriptionType) {

        if (VDBG) {

            logd("[removeSubscriptionInfoRecord]+ uniqueId:" + uniqueId

                    + ", subscriptionType: " + subscriptionType);