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

Commit 5786e676 authored by Diogo Ferreira's avatar Diogo Ferreira
Browse files

SemcRIL: Improve AID selection 

Our current AID selection schema will always select the last application
available in the card. This is not an acceptable behavior and worked for
so long because most cards only have a single application.

This patch adds a more robust detection of AIDs which will fix problems.

Change-Id: I46044f5797993407481d3dd876c4fc643772e75a
parent b1e32449

telephony/java/com/android/internal/telephony/SemcRIL.java

+11 −1
Original line number Diff line number Diff line
@@ -384,8 +384,18 @@ public class SemcRIL extends QualcommNoSimReadyRIL implements CommandsInterface 
            ca.pin2           = p.readInt();

            status.addApplication(ca);



            mAid = ca.aid;

        }

        int appIndex = -1;

        if (mPhoneType == RILConstants.CDMA_PHONE) {

            appIndex = status.getCdmaSubscriptionAppIndex();

            Log.d(LOG_TAG, "This is a CDMA PHONE " + appIndex);

        } else {

            appIndex = status.getGsmUmtsSubscriptionAppIndex();

            Log.d(LOG_TAG, "This is a GSM PHONE " + appIndex);

        }



        IccCardApplication application = status.getApplication(appIndex);

        mAid = application.aid;



        return status;

    }