Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel"

Browse Source 
am: 04e5e63305

Change-Id: I90c12c640d8583edf97f3c44a03d5f4a63c0df20
This commit is contained in:
Holly Jiuyu Sun
2018-01-31 00:08:19 +00:00
committed by android-build-merger
parent 79f3dcb694 04e5e63305
commit 8b37eedfc9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -4279,7 +4279,7 @@ public class TelephonyManager {
try {
ITelephony telephony = getITelephony();
if (telephony != null)
return telephony.iccTransmitApduBasicChannel(subId, cla,
return telephony.iccTransmitApduBasicChannel(subId, getOpPackageName(), cla,
instruction, p1, p2, p3, data);
} catch (RemoteException ex) {
} catch (NullPointerException ex) {

3
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -680,6 +680,7 @@ interface ITelephony {
* Input parameters equivalent to TS 27.007 AT+CSIM command.
*
* @param subId The subscription to use.
* @param callingPackage the name of the package making the call.
* @param cla Class of the APDU command.
* @param instruction Instruction of the APDU command.
* @param p1 P1 value of the APDU command.
@@ -690,7 +691,7 @@ interface ITelephony {
* @return The APDU response from the ICC card with the status appended at
* the end.
*/
String iccTransmitApduBasicChannel(int subId, int cla, int instruction,
String iccTransmitApduBasicChannel(int subId, String callingPackage, int cla, int instruction,
int p1, int p2, int p3, String data);
/**