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

Commit 9f69cff1 authored by Muralidhar Reddy Mule's avatar Muralidhar Reddy Mule Committed by Automerger Merge Worker
Browse files

Merge "[MEP] Integrate MEP CardStatus and SlotPortMapping AIDL changes" am:... 

Merge "[MEP] Integrate MEP CardStatus and SlotPortMapping AIDL changes" am: e08749de am: 75719e0e

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

Change-Id: I6cc2576c93ad5d8a4addc87db813dd73a8872a7f
parents 35e6c7be 75719e0e

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

+8 −2
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ import com.android.internal.telephony.dataconnection.KeepaliveStatus; 
import com.android.internal.telephony.uicc.AdnCapacity;

import com.android.internal.telephony.uicc.IccCardApplicationStatus;

import com.android.internal.telephony.uicc.IccCardStatus;

import com.android.internal.telephony.uicc.IccSlotPortMapping;

import com.android.internal.telephony.uicc.IccSlotStatus;

import com.android.internal.telephony.uicc.IccUtils;

import com.android.internal.telephony.uicc.SimPhonebookRecord;
@@ -4185,7 +4186,9 @@ public class RILUtils { 
            }

        }

        if (cardStatus15 != null) {

            iccCardStatus.physicalSlotIndex = cardStatus15.base.base.physicalSlotId;

            IccSlotPortMapping slotPortMapping = new IccSlotPortMapping();

            slotPortMapping.mPhysicalSlotIndex = cardStatus15.base.base.physicalSlotId;

            iccCardStatus.mSlotPortMapping = slotPortMapping;

            iccCardStatus.atr = cardStatus15.base.base.atr;

            iccCardStatus.iccid = cardStatus15.base.base.iccid;

            iccCardStatus.eid = cardStatus15.base.eid;
@@ -4228,7 +4231,6 @@ public class RILUtils { 
        iccCardStatus.mGsmUmtsSubscriptionAppIndex = cardStatus.gsmUmtsSubscriptionAppIndex;

        iccCardStatus.mCdmaSubscriptionAppIndex = cardStatus.cdmaSubscriptionAppIndex;

        iccCardStatus.mImsSubscriptionAppIndex = cardStatus.imsSubscriptionAppIndex;

        iccCardStatus.physicalSlotIndex = cardStatus.slotMap.physicalSlotId;

        iccCardStatus.atr = cardStatus.atr;

        iccCardStatus.iccid = cardStatus.iccid;

        iccCardStatus.eid = cardStatus.eid;
@@ -4250,6 +4252,10 @@ public class RILUtils { 
            appStatus.pin2 = appStatus.PinStateFromRILInt(rilAppStatus.pin2);

            iccCardStatus.mApplications[i] = appStatus;

        }

        IccSlotPortMapping slotPortMapping = new IccSlotPortMapping();

        slotPortMapping.mPhysicalSlotIndex = cardStatus.slotMap.physicalSlotId;

        slotPortMapping.mPortIndex = cardStatus.slotMap.portId;

        iccCardStatus.mSlotPortMapping = slotPortMapping;

        return iccCardStatus;

    }

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

+7 −2
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo; 
import com.android.internal.telephony.uicc.AdnCapacity;

import com.android.internal.telephony.uicc.IccCardStatus;

import com.android.internal.telephony.uicc.IccIoResult;

import com.android.internal.telephony.uicc.IccSlotPortMapping;



import java.util.ArrayList;

import java.util.Collections;
@@ -1891,7 +1892,9 @@ public class RadioResponse extends IRadioResponse.Stub { 


        if (rr != null) {

            IccCardStatus iccCardStatus = RILUtils.convertHalCardStatus(cardStatus.base);

            iccCardStatus.physicalSlotIndex = cardStatus.physicalSlotId;

            IccSlotPortMapping slotPortMapping = new IccSlotPortMapping();

            slotPortMapping.mPhysicalSlotIndex = cardStatus.physicalSlotId;

            iccCardStatus.mSlotPortMapping = slotPortMapping;

            iccCardStatus.atr = cardStatus.atr;

            iccCardStatus.iccid = cardStatus.iccid;

            mRil.riljLog("responseIccCardStatus: from HIDL: " + iccCardStatus);
@@ -1908,7 +1911,9 @@ public class RadioResponse extends IRadioResponse.Stub { 


        if (rr != null) {

            IccCardStatus iccCardStatus = RILUtils.convertHalCardStatus(cardStatus.base.base);

            iccCardStatus.physicalSlotIndex = cardStatus.base.physicalSlotId;

            IccSlotPortMapping slotPortMapping = new IccSlotPortMapping();

            slotPortMapping.mPhysicalSlotIndex = cardStatus.base.physicalSlotId;

            iccCardStatus.mSlotPortMapping = slotPortMapping;

            iccCardStatus.atr = cardStatus.base.atr;

            iccCardStatus.iccid = cardStatus.base.iccid;

            iccCardStatus.eid = cardStatus.eid;

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

+4 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ public class IccCardStatus { 
    public int        mCdmaSubscriptionAppIndex;

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

    public int        mImsSubscriptionAppIndex;

    public int        physicalSlotIndex = UiccController.INVALID_SLOT_ID;

    public String     atr;

    public String     iccid;

    public String     eid;
@@ -86,6 +85,8 @@ public class IccCardStatus { 
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public IccCardApplicationStatus[] mApplications;



    public IccSlotPortMapping mSlotPortMapping;



    public void setCardState(int state) {

        switch(state) {

        case 0:
@@ -167,9 +168,10 @@ public class IccCardStatus { 
            sb.append(app == null ? "null" : app);

        }



        sb.append(",physical_slot_id=").append(physicalSlotIndex).append(",atr=").append(atr);

        sb.append(",atr=").append(atr);

        sb.append(",iccid=").append(SubscriptionInfo.givePrintableIccid(iccid));

        sb.append(",eid=").append(eid);

        sb.append(",SlotPortMapping=").append(mSlotPortMapping);



        sb.append("}");

        return sb.toString();

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

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.telephony.uicc;



import android.telephony.TelephonyManager;



/**

 * This class provides the physical slot index and port index mapping as per the

 * Multiple Enabled Profiles requirement.

 */

public class IccSlotPortMapping {



    public int mPhysicalSlotIndex = UiccController.INVALID_SLOT_ID;

    public int mPortIndex = TelephonyManager.DEFAULT_PORT_INDEX;



    public IccSlotPortMapping() {

    }



    @Override

    public String toString() {

        return "{" + "physicalSlotIndex=" + mPhysicalSlotIndex + ", portIndex=" + mPortIndex + "}";

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ public class UiccController extends Handler { 


        logWithLocalLog("onGetIccCardStatusDone: phoneId " + index + " IccCardStatus: " + status);



        int slotId = status.physicalSlotIndex;

        int slotId = status.mSlotPortMapping.mPhysicalSlotIndex;

        if (VDBG) log("onGetIccCardStatusDone: phoneId " + index + " physicalSlotIndex " + slotId);

        if (slotId == INVALID_SLOT_ID) {

            slotId = index;