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

Commit 2d06acae authored by Pranav Madapurmath's avatar Pranav Madapurmath Committed by Android (Google) Code Review
Browse files

Merge "TelephonyManager API review changes" into main

parents 570008e6 c7749814

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -14716,7 +14716,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();

    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 @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @Nullable @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, "com.android.phone.permission.ACCESS_LAST_KNOWN_CELL_ID"}) public android.telephony.CellIdentity getLastKnownCellIdentity();

    method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @Nullable @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_LAST_KNOWN_CELL_ID}) public android.telephony.CellIdentity getLastKnownCellIdentity();

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

    method public int getMaxNumberOfSimultaneouslyActiveSims();

    method public static long getMaxNumberVerificationTimeoutMillis();

telephony/java/android/telephony/TelephonyManager.java

+1 −2
Original line number Diff line number Diff line
@@ -18492,7 +18492,6 @@ public class TelephonyManager { 














    /**















     * Get last known cell identity.













     * Require appropriate permissions, otherwise throws SecurityException.















     *















     * If there is current registered network this value will be same as the registered cell















     * identity. If the device goes out of service the previous cell identity is cached and









@@ -18504,7 +18503,7 @@ public class TelephonyManager {













    @SystemApi















    @FlaggedApi(com.android.server.telecom.flags.Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES)















    @RequiresPermission(allOf = {Manifest.permission.ACCESS_FINE_LOCATION,













            "com.android.phone.permission.ACCESS_LAST_KNOWN_CELL_ID"})













            Manifest.permission.ACCESS_LAST_KNOWN_CELL_ID})















    public @Nullable CellIdentity getLastKnownCellIdentity() {















        try {















            ITelephony telephony = getITelephony();