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

Commit 6c0c1c48 authored by Jeff Davidson's avatar Jeff Davidson Committed by gitbuildkicker
Browse files

Updated tests and callers for carrier "associated" apps.

Bug: 30141427
Change-Id: I15a4a04983e80e7d8c1b212ed6654ae5b6b3a0bf
parent eb92ba8b
Loading
Loading
Loading
Loading
+6 −3
Original line number Original line Diff line number Diff line
@@ -147,7 +147,8 @@ public class SubscriptionInfoUpdater extends Handler {
                        throws RemoteException {
                        throws RemoteException {
                    mCurrentlyActiveUserId = newUserId;
                    mCurrentlyActiveUserId = newUserId;
                    CarrierAppUtils.disableCarrierAppsUntilPrivileged(mContext.getOpPackageName(),
                    CarrierAppUtils.disableCarrierAppsUntilPrivileged(mContext.getOpPackageName(),
                            mPackageManager, TelephonyManager.getDefault(), mCurrentlyActiveUserId);
                            mPackageManager, TelephonyManager.getDefault(),
                            mContext.getContentResolver(), mCurrentlyActiveUserId);


                    if (reply != null) {
                    if (reply != null) {
                        try {
                        try {
@@ -172,7 +173,8 @@ public class SubscriptionInfoUpdater extends Handler {
            logd("Couldn't get current user ID; guessing it's 0: " + e.getMessage());
            logd("Couldn't get current user ID; guessing it's 0: " + e.getMessage());
        }
        }
        CarrierAppUtils.disableCarrierAppsUntilPrivileged(mContext.getOpPackageName(),
        CarrierAppUtils.disableCarrierAppsUntilPrivileged(mContext.getOpPackageName(),
                mPackageManager, TelephonyManager.getDefault(), mCurrentlyActiveUserId);
                mPackageManager, TelephonyManager.getDefault(), mContext.getContentResolver(),
                mCurrentlyActiveUserId);
    }
    }


    private final BroadcastReceiver sReceiver = new  BroadcastReceiver() {
    private final BroadcastReceiver sReceiver = new  BroadcastReceiver() {
@@ -488,7 +490,8 @@ public class SubscriptionInfoUpdater extends Handler {


        // Update set of enabled carrier apps now that the privilege rules may have changed.
        // Update set of enabled carrier apps now that the privilege rules may have changed.
        CarrierAppUtils.disableCarrierAppsUntilPrivileged(mContext.getOpPackageName(),
        CarrierAppUtils.disableCarrierAppsUntilPrivileged(mContext.getOpPackageName(),
                mPackageManager, TelephonyManager.getDefault(), mCurrentlyActiveUserId);
                mPackageManager, TelephonyManager.getDefault(), mContext.getContentResolver(),
                mCurrentlyActiveUserId);


        broadcastSimStateChanged(slotId, IccCardConstants.INTENT_VALUE_ICC_LOADED, null);
        broadcastSimStateChanged(slotId, IccCardConstants.INTENT_VALUE_ICC_LOADED, null);
        updateCarrierServices(slotId, IccCardConstants.INTENT_VALUE_ICC_LOADED);
        updateCarrierServices(slotId, IccCardConstants.INTENT_VALUE_ICC_LOADED);
+276 −47

File changed.

Preview size limit exceeded, changes collapsed.