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

Commit abf9e43c authored by yinchengzhao's avatar yinchengzhao
Browse files

Fix for Telephony Manager API javadoc inconsistencies 

Bug: 144455918
Test: atest TelephonyManagerTest
Change-Id: Iac372f04afe210ac7d3edc6fc880ee6a7e614945
parent 72f579d5

telephony/java/android/telephony/TelephonyManager.java

+4 −3
Original line number Diff line number Diff line
@@ -6692,7 +6692,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.
@@ -6706,7 +6707,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) {
@@ -6715,7 +6716,7 @@ public class TelephonyManager { 
            // This could happen before phone starts

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

        }

        return 0;

        return -1;

    }



    /**