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

Commit 3176d2b5 authored by Jonas Claeson's avatar Jonas Claeson Committed by Zoran Jovanovic
Browse files

Fix getActiveSubscriptionInfoForIccId iccId comparison 

The function compared references instead of strings.

Introduced by:

commit c22e8507
Author: Svet Ganov <svetoslavganov@google.com>
Date: Wed Apr 22 13:09:14 2015 -0700

Change-Id: Ib5bb464f708ff548588c2af30e14ea559cf45333
parent 20955c93

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;