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

Commit 6466dd02 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Added getEquivalentHomePlmns API" am: 6c541722 am: ee052afb am:... 

Merge "Added getEquivalentHomePlmns API" am: 6c541722 am: ee052afb am: ed1d2560 am: 73d3765e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1441700

Change-Id: Ief8a0aa10e5b587692711c2974375dc9b68d72b8
parents 84278215 73d3765e

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11188,6 +11188,7 @@ package android.telephony { 
    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<java.lang.String> getEquivalentHomePlmns();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();

non-updatable-api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10070,6 +10070,7 @@ package android.telephony { 
    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<java.lang.String> getEquivalentHomePlmns();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();

telephony/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ package android.telephony { 
    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<java.lang.String> getEquivalentHomePlmns();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();

telephony/java/android/telephony/TelephonyManager.java

+34 −0
Original line number Diff line number Diff line
@@ -13388,4 +13388,38 @@ public class TelephonyManager { 
            return true;

        }

    }













    /**













     * Returns a list of the equivalent home PLMNs (EF_EHPLMN) from the USIM app.













     *













     * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}













     * or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).













     *













     * @return A list of equivalent home PLMNs. Returns an empty list if EF_EHPLMN is empty or













     * does not exist on the SIM card.













     *













     * @throws IllegalStateException if the Telephony process is not currently available.













     * @throws SecurityException if the caller doesn't have the permission.













     *













     * @hide













     */













    @SystemApi













    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)













    public @NonNull List<String> getEquivalentHomePlmns() {













        try {













            ITelephony telephony = getITelephony();













            if (telephony != null) {













                return telephony.getEquivalentHomePlmns(getSubId(), mContext.getOpPackageName(),













                        getAttributionTag());













            } else {













                throw new IllegalStateException("telephony service is null.");













            }













        } catch (RemoteException ex) {













            if (!isSystemProcess()) {













                ex.rethrowAsRuntimeException();













            }













        }

























        return Collections.emptyList();













    }















}

























telephony/java/com/android/internal/telephony/ITelephony.aidl



+8
−0




























Original line number
Diff line number
Diff line








@@ -2297,4 +2297,12 @@ interface ITelephony {













     * Whether device can connect to 5G network when two SIMs are active.















     */















    boolean canConnectTo5GInDsdsMode();



























    /**













     * Returns a list of the equivalent home PLMNs (EF_EHPLMN) from the USIM app.













     *













     * @return A list of equivalent home PLMNs. Returns an empty list if EF_EHPLMN is empty or













     * does not exist on the SIM card.













     */













    List<String> getEquivalentHomePlmns(int subId, String callingPackage, String callingFeatureId);















}