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

Commit e65d767e authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Check READ_PRIVILEGED_PHONE_STATE instead of READ_PHONE_STATE for... 

Merge "Check READ_PRIVILEGED_PHONE_STATE instead of READ_PHONE_STATE for getAvailableSubscriptionInfoList" into rvc-dev
parents d8eb47f6 9f741b9a

src/java/com/android/internal/telephony/SubscriptionController.java

+13 −6
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import android.telephony.UiccAccessRule; 
import android.telephony.UiccSlotInfo;

import android.telephony.euicc.EuiccManager;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.LocalLog;

import android.util.Log;
@@ -1049,12 +1050,18 @@ public class SubscriptionController extends ISub.Stub { 
    @Override

    public List<SubscriptionInfo> getAvailableSubscriptionInfoList(String callingPackage,

            String callingFeatureId) {

        // This API isn't public, so no need to provide a valid subscription ID - we're not worried

        // about carrier-privileged callers not having access.

        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(

                mContext, SubscriptionManager.INVALID_SUBSCRIPTION_ID, callingPackage,

                callingFeatureId, "getAvailableSubscriptionInfoList")) {

            throw new SecurityException("Need READ_PHONE_STATE to call "

        try {

            enforceReadPrivilegedPhoneState("getAvailableSubscriptionInfoList");

        } catch (SecurityException e) {

            try {

                mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE, null);

                // If caller doesn't have READ_PRIVILEGED_PHONE_STATE permission but only

                // has READ_PHONE_STATE permission, log this event.

                EventLog.writeEvent(0x534e4554, "185235454", Binder.getCallingUid());

            } catch (SecurityException ex) {

                // Ignore

            }

            throw new SecurityException("Need READ_PRIVILEGED_PHONE_STATE to call "

                    + " getAvailableSubscriptionInfoList");

        }