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

Commit 1f7f2629 authored by nharold's avatar nharold Committed by android-build-merger
Browse files

Merge changes from topic 'query-fplmn-sync' 

am: 0dc62c6d

Change-Id: Ibc08427e8de920f7f95a6a530b45cfcf8402d203
parents 4e8cd7dc 0dc62c6d

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -38015,6 +38015,7 @@ package android.telephony { 
    method public java.lang.String getDeviceId();

    method public java.lang.String getDeviceId();

    method public java.lang.String getDeviceId(int);

    method public java.lang.String getDeviceId(int);

    method public java.lang.String getDeviceSoftwareVersion();

    method public java.lang.String getDeviceSoftwareVersion();

    method public java.lang.String[] getForbiddenPlmns();

    method public java.lang.String getGroupIdLevel1();

    method public java.lang.String getGroupIdLevel1();

    method public java.lang.String getIccAuthentication(int, int, java.lang.String);

    method public java.lang.String getIccAuthentication(int, int, java.lang.String);

    method public java.lang.String getLine1Number();

    method public java.lang.String getLine1Number();

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -41231,6 +41231,7 @@ package android.telephony { 
    method public java.lang.String getDeviceId();

    method public java.lang.String getDeviceId();

    method public java.lang.String getDeviceId(int);

    method public java.lang.String getDeviceId(int);

    method public java.lang.String getDeviceSoftwareVersion();

    method public java.lang.String getDeviceSoftwareVersion();

    method public java.lang.String[] getForbiddenPlmns();

    method public java.lang.String getGroupIdLevel1();

    method public java.lang.String getGroupIdLevel1();

    method public java.lang.String getIccAuthentication(int, int, java.lang.String);

    method public java.lang.String getIccAuthentication(int, int, java.lang.String);

    method public java.lang.String getImei();

    method public java.lang.String getImei();

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -38098,6 +38098,7 @@ package android.telephony { 
    method public java.lang.String getDeviceId();

    method public java.lang.String getDeviceId();

    method public java.lang.String getDeviceId(int);

    method public java.lang.String getDeviceId(int);

    method public java.lang.String getDeviceSoftwareVersion();

    method public java.lang.String getDeviceSoftwareVersion();

    method public java.lang.String[] getForbiddenPlmns();

    method public java.lang.String getGroupIdLevel1();

    method public java.lang.String getGroupIdLevel1();

    method public java.lang.String getIccAuthentication(int, int, java.lang.String);

    method public java.lang.String getIccAuthentication(int, int, java.lang.String);

    method public java.lang.String getLine1Number();

    method public java.lang.String getLine1Number();

telephony/java/android/telephony/TelephonyManager.java

+39 −0
Original line number Original line Diff line number Diff line
@@ -4189,6 +4189,45 @@ public class TelephonyManager { 
        }

        }

    }

    }





    /**

     * Returns an array of Forbidden PLMNs from the USIM App

     * Returns null if the query fails.

     *

     *

     * <p>Requires that the caller has READ_PRIVILEGED_PHONE_STATE

     *

     * @return an array of forbidden PLMNs or null if not available

     */

    public String[] getForbiddenPlmns() {

      return getForbiddenPlmns(getSubId(), APPTYPE_USIM);

    }



    /**

     * Returns an array 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

     *

     * @param subId subscription ID used for authentication

     * @param appType the icc application type, like {@link #APPTYPE_USIM}

     * @return fplmns an array of forbidden PLMNs

     * @hide

     */

    public String[] getForbiddenPlmns(int subId, int appType) {

        try {

            ITelephony telephony = getITelephony();

            if (telephony == null)

                return null;

            return telephony.getForbiddenPlmns(subId, appType);

        } catch (RemoteException ex) {

            return null;

        } catch (NullPointerException ex) {

            // This could happen before phone starts

            return null;

        }

    }



    /**

    /**

     * Get P-CSCF address from PCO after data connection is established or modified.

     * Get P-CSCF address from PCO after data connection is established or modified.

     * @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN

     * @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN

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

+12 −1
Original line number Original line Diff line number Diff line
@@ -1218,7 +1218,6 @@ interface ITelephony { 
     */

     */

    void setPolicyDataEnabled(boolean enabled, int subId);

    void setPolicyDataEnabled(boolean enabled, int subId);







    /**

    /**

     * Get Client request stats which will contain statistical information

     * Get Client request stats which will contain statistical information

     * on each request made by client.

     * on each request made by client.
@@ -1235,4 +1234,16 @@ interface ITelephony { 
     * @hide

     * @hide

     * */

     * */

    void setSimPowerStateForSlot(int slotId, boolean powerUp);

    void setSimPowerStateForSlot(int slotId, boolean powerUp);



    /**

     * 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

     *

     * @param subId subscription ID used for authentication

     * @param appType the icc application type, like {@link #APPTYPE_USIM}

     */

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

}
 
}