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

Commit 9f7752fc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5586686 from 276114b2 to qt-c2f2-release 

Change-Id: I3278cf14c31a9c5a15787a951e60aee1f3a8021d
parents 991c2326 276114b2

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

+3 −1
Original line number Diff line number Diff line
@@ -2856,6 +2856,9 @@ public class SubscriptionController extends ISub.Stub { 
        if (subIdList == null || subIdList.length == 0) {

            throw new IllegalArgumentException("Invalid subIdList " + subIdList);

        }



        // Makes sure calling package matches caller UID.

        mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);

        // If it doesn't have modify phone state permission, or carrier privilege permission,

        // a SecurityException will be thrown.

        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
@@ -3081,7 +3084,6 @@ public class SubscriptionController extends ISub.Stub { 
     *  @return true if checking passes on all subId, false otherwise.

     */

    private boolean checkCarrierPrivilegeOnSubList(int[] subIdList, String callingPackage) {

        mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);

        // Check carrier privilege permission on active subscriptions first.

        // If it fails, they could be inactive. So keep them in a HashSet and later check

        // access rules in our database.

src/java/com/android/internal/telephony/uicc/UiccController.java

+1 −0
Original line number Diff line number Diff line
@@ -717,6 +717,7 @@ public class UiccController extends Handler { 
        ArrayList<UiccCardInfo> infos = new ArrayList<>();

        for (int slotIndex = 0; slotIndex < mUiccSlots.length; slotIndex++) {

            final UiccSlot slot = mUiccSlots[slotIndex];

            if (slot == null) continue;

            boolean isEuicc = slot.isEuicc();

            String eid = null;

            UiccCard card = slot.getUiccCard();