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

Commit af300d9c authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Gerrit Code Review
Browse files

Merge "Fix getActiveSubscriptionInfoForIccId iccId comparison"

parents 52d980e6 3176d2b5

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

+3 −2
Original line number Diff line number Diff line
@@ -430,7 +430,8 @@ public class SubscriptionController extends ISub.Stub { 
     */

    @Override

    public SubscriptionInfo getActiveSubscriptionInfoForIccId(String iccId, String callingPackage) {

        if (!canReadPhoneState(callingPackage, "getActiveSubscriptionInfoForIccId")) {

        if (!canReadPhoneState(callingPackage, "getActiveSubscriptionInfoForIccId") ||

                iccId == null) {

            return null;

        }
@@ -441,7 +442,7 @@ public class SubscriptionController extends ISub.Stub { 
                    mContext.getOpPackageName());

            if (subList != null) {

                for (SubscriptionInfo si : subList) {

                    if (si.getIccId() == iccId) {

                    if (iccId.equals(si.getIccId())) {

                        if (DBG)

                            logd("[getActiveSubInfoUsingIccId]+ iccId=" + iccId + " subInfo=" + si);

                        return si;