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

Commit a97d430a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check AppOps bit for TelephonyManager#getForbiddenPlmns" into pi-dev

parents 02fea57d 5b65aea4

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -5183,7 +5183,7 @@ public class TelephonyManager { 
            ITelephony telephony = getITelephony();

            if (telephony == null)

                return null;

            return telephony.getForbiddenPlmns(subId, appType);

            return telephony.getForbiddenPlmns(subId, appType, mContext.getOpPackageName());

        } catch (RemoteException ex) {

            return null;

        } catch (NullPointerException ex) {

telephony/java/com/android/internal/telephony/ITelephony.aidl

+2 −3
Original line number Diff line number Diff line
@@ -1444,13 +1444,12 @@ interface ITelephony { 
     * 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

     * <p>Requires that the calling app has READ_PRIVILEGED_PHONE_STATE or READ_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);

    String[] getForbiddenPlmns(int subId, int appType, String callingPackage);



    /**

     * Check if phone is in emergency callback mode