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

Commit 8869208e authored by Amruth Ramachandran's avatar Amruth Ramachandran Committed by Automerger Merge Worker
Browse files

Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into... 

Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into tm-dev am: 3e5894b2 am: 843431d9

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



Change-Id: I8e63e8b07e598a163185f7620facf3349192e42d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a47e078f 843431d9

telephony/java/android/telephony/TelephonyManager.java

+37 −0
Original line number Diff line number Diff line
@@ -17006,4 +17006,41 @@ public class TelephonyManager { 
        }

        mTelephonyRegistryMgr.removeCarrierPrivilegesCallback(callback);

    }













    /**













     * set removable eSIM as default eUICC.













     *













     * @hide













     */













    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)













    @RequiresFeature(PackageManager.FEATURE_TELEPHONY_EUICC)













    public void setRemovableEsimAsDefaultEuicc(boolean isDefault) {













        try {













            ITelephony telephony = getITelephony();













            if (telephony != null) {













                telephony.setRemovableEsimAsDefaultEuicc(isDefault, getOpPackageName());













            }













        } catch (RemoteException e) {













            Log.e(TAG, "Error in setRemovableEsimAsDefault: " + e);













        }













    }

























    /**













     * Returns whether the removable eSIM is default eUICC or not.













     *













     * @hide













     */













    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    @RequiresFeature(PackageManager.FEATURE_TELEPHONY_EUICC)













    public boolean isRemovableEsimDefaultEuicc() {













        try {













            ITelephony telephony = getITelephony();













            if (telephony != null) {













                return telephony.isRemovableEsimDefaultEuicc(getOpPackageName());













            }













        } catch (RemoteException e) {













            Log.e(TAG, "Error in isRemovableEsimDefaultEuicc: " + e);













        }













        return false;













    }















}

























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



+14
−0




























Original line number
Diff line number
Diff line








@@ -2553,4 +2553,18 @@ interface ITelephony {













     * for the slot, or {@code null} if none is resolved















     */















    String getCarrierServicePackageNameForLogicalSlot(int logicalSlotIndex);



























    /**













     * set removable eSIM as default eUICC.













     *













     * @hide













     */













    void setRemovableEsimAsDefaultEuicc(boolean isDefault, String callingPackage);



























    /**













     * Returns whether the removable eSIM is default eUICC or not.













     *













     * @hide













     */













    boolean isRemovableEsimDefaultEuicc(String callingPackage);















}