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

Commit 84e5400f authored by sqian's avatar sqian Committed by android-build-team Robot
Browse files

Fix broken check for TelephonyManager#getForbiddenPlmns 

(backport from a fix merged in pi-dev)

Bug: 73884967
Test: Treehugger
Change-Id: I9deaae20893184cde36dcd936fe83708fa60b830
Merged-In: I0cf7920e138892fbcab71fae0eed1293f0b2e404
Merged-In: I9e3456e5f1e479b0e2b102f6c90db57cd0e977fe
(cherry picked from commit 7b52a48d)
parent 855b30da

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4605,7 +4605,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
@@ -1352,12 +1352,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