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

Commit a5c2f666 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Fix bug of default data / voice / sms sub is cleared unexpectedly." am: 24640f8f 

am: 0a4cea0b

Change-Id: If7fea87ac7779c5fad8405f488ef1109082c906b
parents 4335a678 0a4cea0b

src/java/com/android/internal/telephony/SubscriptionController.java

+0 −3
Original line number Diff line number Diff line
@@ -1325,9 +1325,6 @@ public class SubscriptionController extends ISub.Stub { 
        refreshCachedActiveSubscriptionInfoList();



        sSlotIndexToSubIds.remove(slotIndex);



        // update default subId

        clearDefaultsForInactiveSubIds();

    }



    /**

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+3 −0
Original line number Diff line number Diff line
@@ -603,6 +603,9 @@ public class SubscriptionInfoUpdater extends Handler { 
            }

        }



        // update default subId

        SubscriptionController.getInstance().clearDefaultsForInactiveSubIds();



        SubscriptionController.getInstance().notifySubscriptionInfoChanged();

        logd("updateSubscriptionInfoByIccId:- SubscriptionInfo update complete");

    }