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

Merge changes from topic 'query-fplmn-sync'

Browse Source 
* changes:
  Provide a public API for TelephonyManager.getForbiddenPlmns()
  Add support for querying Forbidden PLMNs
This commit is contained in:
nharold
2017-03-01 20:25:15 +00:00
committed by Gerrit Code Review
parent 32d763b0ed 6a7c9333b9
commit 0dc62c6dd3
5 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -38015,6 +38015,7 @@ package android.telephony {
method public java.lang.String getDeviceId();
method public java.lang.String getDeviceId(int);
method public java.lang.String getDeviceSoftwareVersion();
method public java.lang.String[] getForbiddenPlmns();
method public java.lang.String getGroupIdLevel1();
method public java.lang.String getIccAuthentication(int, int, java.lang.String);
method public java.lang.String getLine1Number();

1
api/system-current.txt
View File

@@ -41231,6 +41231,7 @@ package android.telephony {
method public java.lang.String getDeviceId();
method public java.lang.String getDeviceId(int);
method public java.lang.String getDeviceSoftwareVersion();
method public java.lang.String[] getForbiddenPlmns();
method public java.lang.String getGroupIdLevel1();
method public java.lang.String getIccAuthentication(int, int, java.lang.String);
method public java.lang.String getImei();

1
api/test-current.txt
View File

@@ -38097,6 +38097,7 @@ package android.telephony {
method public java.lang.String getDeviceId();
method public java.lang.String getDeviceId(int);
method public java.lang.String getDeviceSoftwareVersion();
method public java.lang.String[] getForbiddenPlmns();
method public java.lang.String getGroupIdLevel1();
method public java.lang.String getIccAuthentication(int, int, java.lang.String);
method public java.lang.String getLine1Number();

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

@@ -4188,6 +4188,45 @@ public class TelephonyManager {
}
}
/**
* Returns an array of Forbidden PLMNs from the USIM App
* Returns null if the query fails.
*
*
* <p>Requires that the caller has READ_PRIVILEGED_PHONE_STATE
*
* @return an array of forbidden PLMNs or null if not available
*/
public String[] getForbiddenPlmns() {
return getForbiddenPlmns(getSubId(), APPTYPE_USIM);
}
/**
* Returns an array of Forbidden PLMNs from the specified SIM App
* Returns null if the query fails.
*
*
* <p>Requires that the calling app has READ_PRIVILEGED_PHONE_STATE
*
* @param subId subscription ID used for authentication
* @param appType the icc application type, like {@link #APPTYPE_USIM}
* @return fplmns an array of forbidden PLMNs
* @hide
*/
public String[] getForbiddenPlmns(int subId, int appType) {
try {
ITelephony telephony = getITelephony();
if (telephony == null)
return null;
return telephony.getForbiddenPlmns(subId, appType);
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
// This could happen before phone starts
return null;
}
}
/**
* Get P-CSCF address from PCO after data connection is established or modified.
* @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN

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

@@ -1218,7 +1218,6 @@ interface ITelephony {
*/
void setPolicyDataEnabled(boolean enabled, int subId);
/**
* Get Client request stats which will contain statistical information
* on each request made by client.
@@ -1235,4 +1234,16 @@ interface ITelephony {
* @hide
* */
void setSimPowerStateForSlot(int slotId, boolean powerUp);
/**
* Returns a list of Forbidden PLMNs from the specified SIM App
* Returns null if the query fails.
*
*
* <p>Requires that the calling app has READ_PRIVILEGED_PHONE_STATE
*
* @param subId subscription ID used for authentication
* @param appType the icc application type, like {@link #APPTYPE_USIM}
*/
String[] getForbiddenPlmns(int subId, int appType);
}