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

Commit a086824e authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by android-build-merger
Browse files

Merge "Create Public API which exposes if the device is in a state where... 

Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
am: 3a8ad81a

Change-Id: I54d5ac5a02b4bb0e0bd9d3f3eb2428613c40c1ec
parents f729fccd 3a8ad81a

api/current.txt

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

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

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

    method public boolean isConcurrentVoiceAndDataAllowed();

    method public boolean isHearingAidCompatibilitySupported();

    method public boolean isNetworkRoaming();

    method public boolean isSmsCapable();

api/system-current.txt

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

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

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

    method public boolean isConcurrentVoiceAndDataAllowed();

    method public boolean isDataConnectivityPossible();

    method public boolean isHearingAidCompatibilitySupported();

    method public boolean isIdle();

api/test-current.txt

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

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

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

    method public boolean isConcurrentVoiceAndDataAllowed();

    method public boolean isHearingAidCompatibilitySupported();

    method public boolean isNetworkRoaming();

    method public boolean isSmsCapable();

telephony/java/android/telephony/TelephonyManager.java

+14 −0
Original line number Diff line number Diff line
@@ -5087,6 +5087,20 @@ public class TelephonyManager { 
        }

    }



   /*

    * @return true, if the device is currently on a technology (e.g. UMTS or LTE) which can support

    * voice and data simultaneously. This can change based on location or network condition.

    */

    public boolean isConcurrentVoiceAndDataAllowed() {

        try {

            ITelephony telephony = getITelephony();

            return (telephony == null ? false : telephony.isConcurrentVoiceAndDataAllowed(mSubId));

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelephony#isConcurrentVoiceAndDataAllowed", e);

        }

        return false;

    }



    /** @hide */

    @SystemApi

    public boolean handlePinMmi(String dialString) {

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

+6 −0
Original line number Diff line number Diff line
@@ -492,6 +492,12 @@ interface ITelephony { 
     */

    int getVoiceMessageCountForSubscriber(int subId);



    /**

      * Returns true if current state supports both voice and data

      * simultaneously. This can change based on location or network condition.

      */

    boolean isConcurrentVoiceAndDataAllowed(int subId);



    oneway void setVisualVoicemailEnabled(String callingPackage,

            in PhoneAccountHandle accountHandle, boolean enabled);