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

Commit 8a134554 authored by yinchengzhao's avatar yinchengzhao Committed by android-build-merger
Browse files

Merge "Fix for Telephony Manager API javadoc inconsistencies" 

am: 59b88e0e

Change-Id: I5081bdc8d87deaf2c0361a59598dfb99fd878481
parents a962a655 59b88e0e

telephony/java/android/telephony/TelephonyManager.java

+4 −3
Original line number Diff line number Diff line
@@ -6733,7 +6733,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.
@@ -6747,7 +6748,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) {
@@ -6756,7 +6757,7 @@ public class TelephonyManager { 
            // This could happen before phone starts

            Rlog.e(TAG, "setForbiddenPlmns NullPointerException: " + ex.getMessage());

        }

        return 0;

        return -1;

    }



    /**