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

Commit 2910df87 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics "ENFORCE_SUBSCRIPTION_USER_ASSOCIATION", "sim_state_string" 

* changes:
  Add subscription-user association check.
  Update DataConfigManager with new CarrierConfigManager APIs
  Moved SimStateToString to TelephonyManager
parents 7bba7343 99e69a7a

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

+1 −3
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ import static android.telephony.TelephonyManager.SIM_STATE_NOT_READY; 
import static android.telephony.TelephonyManager.SIM_STATE_READY;

import static android.telephony.TelephonyManager.SIM_STATE_UNKNOWN;



import static com.android.internal.telephony.SubscriptionInfoUpdater.simStateString;



import android.annotation.ElapsedRealtimeLong;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -525,7 +523,7 @@ public class CarrierPrivilegesTracker extends Handler { 
                        SystemClock.uptimeMillis() + CLEAR_UICC_RULES_DELAY_MILLIS;

                sendMessageAtTime(obtainMessage(ACTION_CLEAR_UICC_RULES),

                        mClearUiccRulesUptimeMillis);

                mLocalLog.log("SIM is gone, simState=" + simStateString(simState)

                mLocalLog.log("SIM is gone, simState=" + TelephonyManager.simStateToString(simState)

                        + ". Delay " + TimeUnit.MILLISECONDS.toSeconds(

                        CLEAR_UICC_RULES_DELAY_MILLIS) + " seconds to clear UICC rules.");

            } else {

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

+50 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.os.Binder; 
import android.os.Build;

import android.os.Bundle;

import android.os.TelephonyServiceManager.ServiceRegisterer;

import android.os.UserHandle;

import android.provider.Telephony.Sms.Intents;

import android.telephony.CarrierConfigManager;

import android.telephony.SmsManager;
@@ -156,6 +157,14 @@ public class SmsController extends ISmsImplBase { 
            callingPackage = getCallingPackage();

        }



        // Check if user is associated with the subscription

        if (!TelephonyPermissions.checkSubscriptionAssociatedWithUser(mContext, subId,

                Binder.getCallingUserHandle())) {

            // TODO(b/258629881): Display error dialog.

            sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_USER_NOT_ALLOWED);

            return;

        }



        // Perform FDN check

        if (isNumberBlockedByFDN(subId, destAddr, callingPackage)) {

            sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE);
@@ -206,6 +215,14 @@ public class SmsController extends ISmsImplBase { 
            return;

        }



        // Check if user is associated with the subscription

        if (!TelephonyPermissions.checkSubscriptionAssociatedWithUser(mContext, subId,

                Binder.getCallingUserHandle())) {

            // TODO(b/258629881): Display error dialog.

            sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_USER_NOT_ALLOWED);

            return;

        }



        // Perform FDN check

        if (isNumberBlockedByFDN(subId, destAddr, callingPackage)) {

            sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE);
@@ -279,6 +296,14 @@ public class SmsController extends ISmsImplBase { 
            callingPackage = getCallingPackage();

        }



        // Check if user is associated with the subscription

        if (!TelephonyPermissions.checkSubscriptionAssociatedWithUser(mContext, subId,

                Binder.getCallingUserHandle())) {

            // TODO(b/258629881): Display error dialog.

            sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_USER_NOT_ALLOWED);

            return;

        }



        // Perform FDN check

        if (isNumberBlockedByFDN(subId, destAddr, callingPackage)) {

            sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE);
@@ -308,6 +333,14 @@ public class SmsController extends ISmsImplBase { 
            callingPackage = getCallingPackage();

        }



        // Check if user is associated with the subscription

        if (!TelephonyPermissions.checkSubscriptionAssociatedWithUser(mContext, subId,

                Binder.getCallingUserHandle())) {

            // TODO(b/258629881): Display error dialog.

            sendErrorInPendingIntents(sentIntents, SmsManager.RESULT_USER_NOT_ALLOWED);

            return;

        }



        // Perform FDN check

        if (isNumberBlockedByFDN(subId, destAddr, callingPackage)) {

            sendErrorInPendingIntents(sentIntents, SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE);
@@ -335,6 +368,14 @@ public class SmsController extends ISmsImplBase { 
            callingPackage = getCallingPackage();

        }



        // Check if user is associated with the subscription

        if (!TelephonyPermissions.checkSubscriptionAssociatedWithUser(mContext, subId,

                Binder.getCallingUserHandle())) {

            // TODO(b/258629881): Display error dialog.

            sendErrorInPendingIntents(sentIntents, SmsManager.RESULT_USER_NOT_ALLOWED);

            return;

        }



        // Perform FDN check

        if (isNumberBlockedByFDN(subId, destAddr, callingPackage)) {

            sendErrorInPendingIntents(sentIntents, SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE);
@@ -775,6 +816,14 @@ public class SmsController extends ISmsImplBase { 
            return;

        }



        // Check if user is associated with the subscription

        if (!TelephonyPermissions.checkSubscriptionAssociatedWithUser(mContext, subId,

                Binder.getCallingUserHandle())) {

            // TODO(b/258629881): Display error dialog.

            sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_USER_NOT_ALLOWED);

            return;

        }



        if (port == 0) {

            sendTextForSubscriberWithSelfPermissionsInternal(subId, callingPackage,

                    callingAttributionTag, number, null, text, sentIntent, null, false,

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

+93 −0
Original line number Diff line number Diff line
@@ -4840,6 +4840,99 @@ public class SubscriptionController extends ISub.Stub { 
        }

    }



    /**

     * Check if subscription and user are associated with each other.

     *

     * @param subscriptionId the subId of the subscription

     * @param userHandle user handle of the user

     * @return {@code true} if subscription is associated with user

     * {code true} if there are no subscriptions on device

     * else {@code false} if subscription is not associated with user.

     *

     * @throws SecurityException if the caller doesn't have permissions required.

     * @throws IllegalStateException if subscription service is not available.

     *

     */

    @Override

    public boolean isSubscriptionAssociatedWithUser(int subscriptionId,

            @NonNull UserHandle userHandle) {

        enforceManageSubscriptionUserAssociation("isSubscriptionAssociatedWithUser");



        long token = Binder.clearCallingIdentity();

        try {

            // Return true if there are no subscriptions on the device.

            List<SubscriptionInfo> subInfoList = getAllSubInfoList(

                    mContext.getOpPackageName(), mContext.getAttributionTag());

            if (subInfoList == null || subInfoList.isEmpty()) {

                return true;

            }



            // Get list of subscriptions associated with this user.

            List<SubscriptionInfo> associatedSubscriptionsList =

                    getSubscriptionInfoListAssociatedWithUser(userHandle);

            if (associatedSubscriptionsList.isEmpty()) {

                return false;

            }



            // Return true if required subscription is present in associated subscriptions list.

            for (SubscriptionInfo subInfo: associatedSubscriptionsList) {

                if (subInfo.getSubscriptionId() == subscriptionId){

                    return true;

                }

            }

            return false;

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    /**

     * Get list of subscriptions associated with user.

     *

     * If user handle is associated with some subscriptions, return subscriptionsAssociatedWithUser

     * else return all the subscriptions which are not associated with any user.

     *

     * @param userHandle user handle of the user

     * @return list of subscriptionInfo associated with the user.

     *

     * @throws SecurityException if the caller doesn't have permissions required.

     * @throws IllegalStateException if subscription service is not available.

     *

     */

    @Override

    public @NonNull List<SubscriptionInfo> getSubscriptionInfoListAssociatedWithUser(

            @NonNull UserHandle userHandle) {

        enforceManageSubscriptionUserAssociation("getActiveSubscriptionInfoListAssociatedWithUser");



        long token = Binder.clearCallingIdentity();

        try {

            List<SubscriptionInfo> subInfoList =  getAllSubInfoList(

                    mContext.getOpPackageName(), mContext.getAttributionTag());

            if (subInfoList == null || subInfoList.isEmpty()) {

                return new ArrayList<>();

            }



            List<SubscriptionInfo> subscriptionsAssociatedWithUser = new ArrayList<>();

            List<SubscriptionInfo> subscriptionsWithNoAssociation = new ArrayList<>();

            for (SubscriptionInfo subInfo : subInfoList) {

                int subId = subInfo.getSubscriptionId();

                UserHandle subIdUserHandle = getSubscriptionUserHandle(subId);

                if (userHandle.equals(subIdUserHandle)) {

                    // Store subscriptions whose user handle matches with required user handle.

                    subscriptionsAssociatedWithUser.add(subInfo);

                } else if (subIdUserHandle == null) {

                    // Store subscriptions whose user handle is set to null.

                    subscriptionsWithNoAssociation.add(subInfo);

                }

            }



            return subscriptionsAssociatedWithUser.isEmpty() ?

                    subscriptionsWithNoAssociation : subscriptionsAssociatedWithUser;

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    /**

     * @hide

     */

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

+6 −44
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import android.telephony.SubscriptionInfo; 
import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.UsageSetting;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager.SimState;

import android.telephony.UiccAccessRule;

import android.telephony.euicc.EuiccManager;

import android.text.TextUtils;
@@ -1301,9 +1300,9 @@ public class SubscriptionInfoUpdater extends Handler { 
            if (slot != null) {

                i.putExtra(PhoneConstants.PORT_KEY, slot.getPortIndexFromPhoneId(phoneId));

            }

            logd("Broadcasting intent ACTION_SIM_CARD_STATE_CHANGED " + simStateString(state)

                    + " for phone: " + phoneId + " slot: " + slotId + " port: "

                    + slot.getPortIndexFromPhoneId(phoneId));

            logd("Broadcasting intent ACTION_SIM_CARD_STATE_CHANGED "

                    + TelephonyManager.simStateToString(state) + " for phone: " + phoneId

                    + " slot: " + slotId + " port: " + slot.getPortIndexFromPhoneId(phoneId));

            sContext.sendBroadcast(i, Manifest.permission.READ_PRIVILEGED_PHONE_STATE);

            TelephonyMetrics.getInstance().updateSimState(phoneId, state);

        }
@@ -1333,51 +1332,14 @@ public class SubscriptionInfoUpdater extends Handler { 
            if (slot != null) {

                i.putExtra(PhoneConstants.PORT_KEY, slot.getPortIndexFromPhoneId(phoneId));

            }

            logd("Broadcasting intent ACTION_SIM_APPLICATION_STATE_CHANGED " + simStateString(state)

                    + " for phone: " + phoneId + " slot: " + slotId + "port: "

                    + slot.getPortIndexFromPhoneId(phoneId));

            logd("Broadcasting intent ACTION_SIM_APPLICATION_STATE_CHANGED "

                    + TelephonyManager.simStateToString(state) + " for phone: " + phoneId

                    + " slot: " + slotId + "port: " + slot.getPortIndexFromPhoneId(phoneId));

            sContext.sendBroadcast(i, Manifest.permission.READ_PRIVILEGED_PHONE_STATE);

            TelephonyMetrics.getInstance().updateSimState(phoneId, state);

        }

    }



    /**

     * Convert SIM state into string

     *

     * @param state SIM state

     * @return SIM state in string format

     */

    public static String simStateString(@SimState int state) {

        switch (state) {

            case TelephonyManager.SIM_STATE_UNKNOWN:

                return "UNKNOWN";

            case TelephonyManager.SIM_STATE_ABSENT:

                return "ABSENT";

            case TelephonyManager.SIM_STATE_PIN_REQUIRED:

                return "PIN_REQUIRED";

            case TelephonyManager.SIM_STATE_PUK_REQUIRED:

                return "PUK_REQUIRED";

            case TelephonyManager.SIM_STATE_NETWORK_LOCKED:

                return "NETWORK_LOCKED";

            case TelephonyManager.SIM_STATE_READY:

                return "READY";

            case TelephonyManager.SIM_STATE_NOT_READY:

                return "NOT_READY";

            case TelephonyManager.SIM_STATE_PERM_DISABLED:

                return "PERM_DISABLED";

            case TelephonyManager.SIM_STATE_CARD_IO_ERROR:

                return "CARD_IO_ERROR";

            case TelephonyManager.SIM_STATE_CARD_RESTRICTED:

                return "CARD_RESTRICTED";

            case TelephonyManager.SIM_STATE_LOADED:

                return "LOADED";

            case TelephonyManager.SIM_STATE_PRESENT:

                return "PRESENT";

            default:

                return "INVALID";

        }

    }



    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private static void logd(String message) {

        Rlog.d(LOG_TAG, message);

src/java/com/android/internal/telephony/data/DataConfigManager.java

+5 −18
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ package com.android.internal.telephony.data; 
import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.StringDef;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Resources;

import android.net.LinkProperties;

import android.net.NetworkCapabilities;
@@ -338,22 +334,13 @@ public class DataConfigManager extends Handler { 
        log("DataConfigManager created.");



        mCarrierConfigManager = mPhone.getContext().getSystemService(CarrierConfigManager.class);



        // Register for carrier configs update

        IntentFilter filter = new IntentFilter();

        filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        mPhone.getContext().registerReceiver(new BroadcastReceiver() {

            @Override

            public void onReceive(Context context, Intent intent) {

                if (intent.getAction().equals(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)) {

                    if (mPhone.getPhoneId() == intent.getIntExtra(

                            CarrierConfigManager.EXTRA_SLOT_INDEX,

                            SubscriptionManager.INVALID_SIM_SLOT_INDEX)) {

        // Callback send msg to handler thread, so callback itself can be executed in binder thread.

        mCarrierConfigManager.registerCarrierConfigChangeListener(Runnable::run,

                (slotIndex, subId, carrierId, specificCarrierId) -> {

                    if (slotIndex == mPhone.getPhoneId()) {

                        sendEmptyMessage(EVENT_CARRIER_CONFIG_CHANGED);

                    }

                }

            }

        }, filter, null, mPhone);

                });



        // Register for device config update

        DeviceConfig.addOnPropertiesChangedListener(