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

Commit ca2b0b78 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" 

am: c79de666

Change-Id: Ia7ed9c42fd6d7725e39238666aa624a33159bb25
parents 6c53b58a c79de666

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

+0 −4
Original line number Diff line number Diff line
@@ -495,10 +495,6 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 
        return uiccApp.getIccRecords().getIccSimChallengeResponse(authType, data);

    }



    public String getGroupIdLevel1(String callingPackage) {

        return getGroupIdLevel1ForSubscriber(getDefaultSubscription(), callingPackage);

    }



    public String getGroupIdLevel1ForSubscriber(int subId, String callingPackage) {

        Phone phone = getPhone(subId);

        if (phone != null) {