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

Commit 0a7c4161 authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev

parents 231719b4 7b52a48d

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4444,7 +4444,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 −2
Original line number Diff line number Diff line
@@ -1306,12 +1306,12 @@ interface ITelephony { 
     * 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