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

Merge "Fix for Telephony Manager API javadoc inconsistencies" am: 59b88e0e6a am: 8a13455417

Browse Source 
Change-Id: Iceb31e933b30363ce89a57305ad70fd5cabfa6fb
This commit is contained in:
Automerger Merge Worker
2019-12-17 01:17:14 +00:00
parent fb829df378 8a13455417
commit 61f1ecb238
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6744,7 +6744,8 @@ public class TelephonyManager {
* If the list is longer than the size of EFfplmn, then the file will be written from the
* beginning of the list up to the file size.
*
* <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
* <p>Requires Permission: {@link android.Manifest.permission#MODIFY_PHONE_STATE
* MODIFY_PHONE_STATE}
* or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
*
* @param fplmns a list of PLMNs to be forbidden.
@@ -6758,7 +6759,7 @@ public class TelephonyManager {
public int setForbiddenPlmns(@NonNull List<String> fplmns) {
try {
ITelephony telephony = getITelephony();
if (telephony == null) return 0;
if (telephony == null) return -1;
return telephony.setForbiddenPlmns(
getSubId(), APPTYPE_USIM, fplmns, getOpPackageName());
} catch (RemoteException ex) {
@@ -6767,7 +6768,7 @@ public class TelephonyManager {
// This could happen before phone starts
Rlog.e(TAG, "setForbiddenPlmns NullPointerException: " + ex.getMessage());
}
return 0;
return -1;
}
/**