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

Commit 448a71b6 authored by Junda Liu's avatar Junda Liu Committed by Android (Google) Code Review
Browse files

Merge "Add EF_GID2 support to uicc and phone." into mnc-dev

parents 3ad0c75d 7234bd86

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

+5 −0
Original line number Diff line number Diff line
@@ -1422,6 +1422,11 @@ public interface Phone { 
     */

    String getGroupIdLevel1();



    /**

     * Retrieves the Group Identifier Level2 for phones.

     */

    String getGroupIdLevel2();



    /**

     * Retrieves the serial number of the ICC, if applicable.

     */

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

+5 −0
Original line number Diff line number Diff line
@@ -1062,6 +1062,11 @@ public class PhoneProxy extends Handler implements Phone { 
        return mActivePhone.getGroupIdLevel1();

    }



    @Override

    public String getGroupIdLevel2() {

        return mActivePhone.getGroupIdLevel2();

    }



    @Override

    public String getIccSerialNumber() {

        return mActivePhone.getIccSerialNumber();

src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java

+6 −0
Original line number Diff line number Diff line
@@ -237,6 +237,12 @@ public class CDMALTEPhone extends CDMAPhone { 
        return (mSimRecords != null) ? mSimRecords.getGid1() : "";

    }



    // return GID2 from USIM

    @Override

    public String getGroupIdLevel2() {

        return (mSimRecords != null) ? mSimRecords.getGid2() : "";

    }



    @Override

    public String getImei() {

        return mImei;

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+6 −0
Original line number Diff line number Diff line
@@ -617,6 +617,12 @@ public class CDMAPhone extends PhoneBase { 
        return null;

    }



    @Override

    public String getGroupIdLevel2() {

        Rlog.e(LOG_TAG, "GID2 is not available in CDMA");

        return null;

    }



    @Override

    public String getImei() {

        Rlog.e(LOG_TAG, "getImei() called for CDMAPhone");

src/java/com/android/internal/telephony/gsm/GSMPhone.java

+6 −0
Original line number Diff line number Diff line
@@ -1066,6 +1066,12 @@ public class GSMPhone extends PhoneBase { 
        return (r != null) ? r.getGid1() : null;

    }



    @Override

    public String getGroupIdLevel2() {

        IccRecords r = mIccRecords.get();

        return (r != null) ? r.getGid2() : null;

    }



    @Override

    public String getLine1Number() {

        IccRecords r = mIccRecords.get();