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

Commit a8366aea authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Enforce READ_PHONE_STATE for APIs involving call state 

For API version 31+, ensure that READ_PHONE_STATE is checked on
APIs that retrieve/notify the call state of the device.

Bug: 157233955
Test: atest CtsTelecomTestCases2 CtsTelephony2TestCases
Change-Id: I9f8674a3075d3e0f75ee4f41eefce328c0fa6b91
parent 1d70937f

core/api/current.txt

+5 −3
Original line number Diff line number Diff line
@@ -40190,6 +40190,7 @@ package android.telecom { 
    field public static final int DURATION_MEDIUM = 2; // 0x2

    field public static final int DURATION_SHORT = 1; // 0x1

    field public static final int DURATION_VERY_SHORT = 0; // 0x0

    field public static final long ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION = 157233955L; // 0x95f3323L

    field public static final String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";

    field public static final String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";

    field public static final String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
@@ -41796,7 +41797,7 @@ package android.telephony { 
    method @Deprecated public void onBarringInfoChanged(@NonNull android.telephony.BarringInfo);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onCallDisconnectCauseChanged(int, int);

    method @Deprecated public void onCallForwardingIndicatorChanged(boolean);

    method @Deprecated public void onCallStateChanged(int, String);

    method @Deprecated @RequiresPermission(value=android.Manifest.permission.READ_PHONE_STATE, conditional=true) public void onCallStateChanged(int, String);

    method @Deprecated public void onCellInfoChanged(java.util.List<android.telephony.CellInfo>);

    method @Deprecated public void onCellLocationChanged(android.telephony.CellLocation);

    method @Deprecated public void onDataActivity(int);
@@ -42342,7 +42343,7 @@ package android.telephony { 
  }















  public static interface TelephonyCallback.CallStateListener {













    method public void onCallStateChanged(int);













    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onCallStateChanged(int);















  }





























  public static interface TelephonyCallback.CarrierNetworkListener {










@@ -42432,7 +42433,8 @@ package android.telephony {













    method public int getActiveModemCount();















    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public java.util.List<android.telephony.CellInfo> getAllCellInfo();















    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getCallComposerStatus();













    method public int getCallState();













    method @Deprecated @RequiresPermission(value=android.Manifest.permission.READ_PHONE_STATE, conditional=true) public int getCallState();













    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getCallStateForSubscription();















    method public int getCardIdForDefaultEuicc();















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















    method public int getCarrierIdFromSimMccMnc();

























core/api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -10880,7 +10880,7 @@ package android.telecom {













    method public java.util.List<android.telecom.PhoneAccount> getAllPhoneAccounts();















    method public int getAllPhoneAccountsCount();















    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts(boolean);













    method public int getCallState();













    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}, conditional=true) public int getCallState();















    method public android.telecom.PhoneAccountHandle getConnectionManager();















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















    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDefaultDialerPackage(@NonNull android.os.UserHandle);

























core/java/android/telephony/PhoneStateListener.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -703,6 +703,10 @@ public class PhoneStateListener {













     * calling {@link TelephonyManager#getCallState()} from within this callback may return a















     * different state than the callback reports.















     *













     * Requires Permission:













     * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} for applications













     * targeting API level 31+.













     *















     * @param state call state















     * @param phoneNumber call phone number. If application does not have















     * {@link android.Manifest.permission#READ_CALL_LOG READ_CALL_LOG} permission or carrier









@@ -712,6 +716,7 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.CallStateListener} instead.















     */















    @Deprecated













    @RequiresPermission(value = android.Manifest.permission.READ_PHONE_STATE, conditional = true)















    public void onCallStateChanged(@CallState int state, String phoneNumber) {















        // default implementation empty















    }

































core/java/android/telephony/TelephonyCallback.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -752,6 +752,7 @@ public class TelephonyCallback {













         *















         * @param state the current call state















         */













        @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)















        public void onCallStateChanged(@Annotation.CallState int state);















    }

















































services/core/java/com/android/server/TelephonyRegistry.java



+26
−0




























Original line number
Diff line number
Diff line








@@ -44,6 +44,7 @@ import android.os.Process;













import android.os.RemoteException;















import android.os.UserHandle;















import android.provider.DeviceConfig;













import android.telecom.TelecomManager;















import android.telephony.Annotation;















import android.telephony.Annotation.RadioPowerState;















import android.telephony.Annotation.SrvccState;










@@ -215,6 +216,18 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {













            return Binder.withCleanCallingIdentity(() -> CompatChanges.isChangeEnabled(















                    TelephonyCallback.PHONE_STATE_LISTENER_LIMIT_CHANGE_ID, uid));















        }



























        /**













         * See {@link TelecomManager#ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION} for more













         * information.













         * @noinspection ConstantConditions













         */













        public boolean isCallStateReadPhoneStateEnforcedInPlatformCompat(String packageName,













                UserHandle userHandle) {













            return Binder.withCleanCallingIdentity(() -> CompatChanges.isChangeEnabled(













                    TelecomManager.ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION, packageName,













                    userHandle));













        }















    }































    private final Context mContext;










@@ -2947,6 +2960,19 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {













            }















        }





























        // Only check READ_PHONE_STATE for CALL_STATE_CHANGED for API 31+.













        if (mConfigurationProvider.isCallStateReadPhoneStateEnforcedInPlatformCompat(callingPackage,













                Binder.getCallingUserHandle())) {













            if (events.contains(TelephonyCallback.EVENT_LEGACY_CALL_STATE_CHANGED)













                    || events.contains(TelephonyCallback.EVENT_CALL_STATE_CHANGED)) {













                if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(













                        mContext, subId, callingPackage, callingFeatureId, message)) {













                    throw new SecurityException("CALL_STATE_CHANGED event requires "













                            + "READ_PHONE_STATE");













                }













            }













        }





























        if (isPrecisePhoneStatePermissionRequired(events)) {















            // check if calling app has either permission READ_PRECISE_PHONE_STATE















            // or with carrier privileges