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

Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev am: 0a7c41615e

Browse Source 
am: 4e0dd1197a

Change-Id: I4b37bce88249278a8b829b90adf679366e417428
This commit is contained in:
android-build-team Robot
2018-04-30 15:39:15 -07:00
committed by android-build-merger
parent f84cc88320 4e0dd1197a
commit d9fb6e1236
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4605,7 +4605,7 @@ public class TelephonyManager {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony == null) if (telephony == null)
return null; return null;
return telephony.getForbiddenPlmns(subId, appType); return telephony.getForbiddenPlmns(subId, appType, mContext.getOpPackageName());
} catch (RemoteException ex) { } catch (RemoteException ex) {
return null; return null;
} catch (NullPointerException ex) { } catch (NullPointerException ex) {

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

@@ -1352,12 +1352,12 @@ interface ITelephony {
* Returns null if the query fails. * Returns null if the query fails.
* *
* *
* <p>Requires that the calling app has READ_PRIVILEGED_PHONE_STATE * <p>Requires that the calling app has READ_PRIVILEGED_PHONE_STATE or READ_PHONE_STATE
* *
* @param subId subscription ID used for authentication * @param subId subscription ID used for authentication
* @param appType the icc application type, like {@link #APPTYPE_USIM} * @param appType the icc application type, like {@link #APPTYPE_USIM}
*/ */
String[] getForbiddenPlmns(int subId, int appType); String[] getForbiddenPlmns(int subId, int appType, String callingPackage);
/** /**
* Check if phone is in emergency callback mode * Check if phone is in emergency callback mode