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

Commit 98ebdae7 authored by Taesu Lee's avatar Taesu Lee
Browse files

Fix dup reading and showing log for fake variables in test mode 



Test: Manual

Change-Id: I0c4670ae71735306f5ab7b0a22f422cba58a7fb0
Signed-off-by: default avatarTaesu Lee <taesu82.lee@samsung.com>
parent c1e7b702

src/java/com/android/internal/telephony/uicc/IccRecords.java

+35 −23
Original line number Diff line number Diff line
@@ -372,12 +372,14 @@ public abstract class IccRecords extends Handler implements IccConstants { 
     */

    @UnsupportedAppUsage

    public String getIccId() {

        if (mCarrierTestOverride.isInTestMode() && mCarrierTestOverride.getFakeIccid() != null) {

            return mCarrierTestOverride.getFakeIccid();

        } else {

            return mIccId;

        if (mCarrierTestOverride.isInTestMode()) {

            String fakeIccId = mCarrierTestOverride.getFakeIccid();

            if (fakeIccId != null) {

                return fakeIccId;

            }

        }

        return mIccId;

    }



    /**

     * Returns the full ICC ID including hex digits.
@@ -545,11 +547,13 @@ public abstract class IccRecords extends Handler implements IccConstants { 
     */

    @UnsupportedAppUsage

    public String getIMSI() {

        if (mCarrierTestOverride.isInTestMode() && mCarrierTestOverride.getFakeIMSI() != null) {

            return mCarrierTestOverride.getFakeIMSI();

        } else {

            return mImsi;

        if (mCarrierTestOverride.isInTestMode()) {

            String fakeImsi = mCarrierTestOverride.getFakeIMSI();

            if (fakeImsi != null) {

                return fakeImsi;

            }

        }

        return mImsi;

    }



    /**
@@ -649,36 +653,41 @@ public abstract class IccRecords extends Handler implements IccConstants { 
     */

    @UnsupportedAppUsage

    public String getGid1() {

        if (mCarrierTestOverride.isInTestMode() && mCarrierTestOverride.getFakeGid1() != null) {

            return mCarrierTestOverride.getFakeGid1();

        } else {

            return mGid1;

        if (mCarrierTestOverride.isInTestMode()) {

            String fakeGid1 = mCarrierTestOverride.getFakeGid1();

            if (fakeGid1 != null) {

                return fakeGid1;

            }

        }

        return mGid1;

    }



    /**

     * Get the Group Identifier Level 2 (GID2) on a SIM.

     * @return null if SIM is not yet ready

     */

    public String getGid2() {

        if (mCarrierTestOverride.isInTestMode() && mCarrierTestOverride.getFakeGid2() != null) {

            return mCarrierTestOverride.getFakeGid2();

        } else {

            return mGid2;

        if (mCarrierTestOverride.isInTestMode()) {

            String fakeGid2 = mCarrierTestOverride.getFakeGid2();

            if (fakeGid2 != null) {

                return fakeGid2;

            }

        }

        return mGid2;

    }



    /**

     * Get the PLMN network name on a SIM.

     * @return null if SIM is not yet ready

     */

    public String getPnnHomeName() {

        if (mCarrierTestOverride.isInTestMode()

                && mCarrierTestOverride.getFakePnnHomeName() != null) {

            return mCarrierTestOverride.getFakePnnHomeName();

        } else {

            return mPnnHomeName;

        if (mCarrierTestOverride.isInTestMode()) {

            String fakePnnHomeName = mCarrierTestOverride.getFakePnnHomeName();

            if (fakePnnHomeName != null) {

                return fakePnnHomeName;

            }

        }

        return mPnnHomeName;

    }



    @UnsupportedAppUsage
@@ -706,8 +715,11 @@ public abstract class IccRecords extends Handler implements IccConstants { 
     */

    @UnsupportedAppUsage

    public String getServiceProviderName() {

        if (mCarrierTestOverride.isInTestMode() && mCarrierTestOverride.getFakeSpn() != null) {

            return mCarrierTestOverride.getFakeSpn();

        if (mCarrierTestOverride.isInTestMode()) {

            String fakeSpn = mCarrierTestOverride.getFakeSpn();

            if (fakeSpn != null) {

                return fakeSpn;

            }

        }

        return mSpn;

    }