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

Commit f6817490 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Remove APDU or AID exchanged in communication with applet in SE" am:... 

Merge "Remove APDU or AID exchanged in communication with applet in SE" am: 9e6db010 am: b658ceaa
am: 2976beb0

Change-Id: I6ca7190d1816c24d9cfd5610be1c63b1bc2c569f
parents 2f55018b 2976beb0

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

+31 −14
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import android.hardware.radio.V1_0.SmsWriteArgs; 
import android.hardware.radio.V1_0.UusInfo;

import android.net.ConnectivityManager;

import android.os.AsyncResult;

import android.os.Build;

import android.os.Handler;

import android.os.HwBinder;

import android.os.Message;
@@ -1170,12 +1171,16 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    mRILDefaultWorkSource);



            if (RILJ_LOGD) {

                if (Build.IS_DEBUGGABLE) {

                    riljLog(rr.serialString() + "> iccIO: "

                            + requestToString(rr.mRequest) + " command = 0x"

                            + Integer.toHexString(command) + " fileId = 0x"

                            + Integer.toHexString(fileId) + " path = " + path + " p1 = "

                            + p1 + " p2 = " + p2 + " p3 = " + " data = " + data

                            + " aid = " + aid);

                } else {

                    riljLog(rr.serialString() + "> iccIO: " + requestToString(rr.mRequest));

                }

            }



            IccIo iccIo = new IccIo();
@@ -2972,9 +2977,13 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    mRILDefaultWorkSource);



            if (RILJ_LOGD) {

                if (Build.IS_DEBUGGABLE) {

                    riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)

                            + " cla = " + cla + " instruction = " + instruction

                            + " p1 = " + p1 + " p2 = " + " p3 = " + p3 + " data = " + data);

                } else {

                    riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));

                }

            }



            SimApdu msg = createSimApdu(0, cla, instruction, p1, p2, p3, data);
@@ -2994,8 +3003,12 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    mRILDefaultWorkSource);



            if (RILJ_LOGD) {

                if (Build.IS_DEBUGGABLE) {

                    riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " aid = " + aid

                            + " p2 = " + p2);

                } else {

                    riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));

                }

            }



            try {
@@ -3041,9 +3054,13 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    mRILDefaultWorkSource);



            if (RILJ_LOGD) {

                if (Build.IS_DEBUGGABLE) {

                    riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " channel = "

                            + channel + " cla = " + cla + " instruction = " + instruction

                            + " p1 = " + p1 + " p2 = " + " p3 = " + p3 + " data = " + data);

                } else {

                    riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));

                }

            }



            SimApdu msg = createSimApdu(channel, cla, instruction, p1, p2, p3, data);