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

Commit 18a0d532 authored by Arun Voddu's avatar Arun Voddu Committed by Android (Google) Code Review
Browse files

Merge "Changed permission from READ_PHONE_STATE to READ_BASIC_PHONE_SATE for TM API." into main

parents 07e4d42b 8ac3494f

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -46100,7 +46100,7 @@ package android.telephony { 
    method public int getCardIdForDefaultEuicc();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @WorkerThread public android.os.PersistableBundle getCarrierConfig();

    method public int getCarrierIdFromSimMccMnc();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void getCarrierRestrictionStatus(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_BASIC_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public void getCarrierRestrictionStatus(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public android.telephony.CellLocation getCellLocation();

    method public int getDataActivity();

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public int getDataNetworkType();

telephony/java/android/telephony/TelephonyManager.java

+4 −1
Original line number Diff line number Diff line
@@ -13928,7 +13928,10 @@ public class TelephonyManager { 
     *          {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}.

     */

    @RequiresFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.READ_BASIC_PHONE_STATE,

            android.Manifest.permission.READ_PHONE_STATE

    })

    public void getCarrierRestrictionStatus(@NonNull Executor executor,

            @NonNull @CarrierRestrictionStatus

                    Consumer<Integer> resultListener) {