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

Commit d43281b3 authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
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 am: e65d767e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/14668856

Change-Id: Id0d3c770dc18284d27dfe562ad7525238e2aabd4
parents f8e5a550 e65d767e

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

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

import android.telephony.UiccSlotInfo;

import android.telephony.euicc.EuiccManager;

import android.telephony.euicc.EuiccManager;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.LocalLog;

import android.util.LocalLog;

import android.util.Log;

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

    @Override

    public List<SubscriptionInfo> getAvailableSubscriptionInfoList(String callingPackage,

    public List<SubscriptionInfo> getAvailableSubscriptionInfoList(String callingPackage,

            String callingFeatureId) {

            String callingFeatureId) {

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

        try {

        // about carrier-privileged callers not having access.

            enforceReadPrivilegedPhoneState("getAvailableSubscriptionInfoList");

        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(

        } catch (SecurityException e) {

                mContext, SubscriptionManager.INVALID_SUBSCRIPTION_ID, callingPackage,

            try {

                callingFeatureId, "getAvailableSubscriptionInfoList")) {

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

            throw new SecurityException("Need READ_PHONE_STATE to call "

                // 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");

                    + " getAvailableSubscriptionInfoList");

        }

        }