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

Commit 2a2174a7 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am ccfd99b1: merge from open-source master 

Merge commit 'ccfd99b1' into kraken

* commit 'ccfd99b1':
  Support for User to User Signaling (UUS)
parents 72a6af1a ccfd99b1

telephony/java/com/android/internal/telephony/CommandsInterface.java

+13 −0
Original line number Diff line number Diff line
@@ -659,6 +659,19 @@ public interface CommandsInterface { 
     */

    void dial (String address, int clirMode, Message result);



    /**

     *  returned message

     *  retMsg.obj = AsyncResult ar

     *  ar.exception carries exception on failure

     *  ar.userObject contains the orignal value of result.obj

     *  ar.result is null on success and failure

     *

     * CLIR_DEFAULT     == on "use subscription default value"

     * CLIR_SUPPRESSION == on "CLIR suppression" (allow CLI presentation)

     * CLIR_INVOCATION  == on "CLIR invocation" (restrict CLI presentation)

     */

    void dial(String address, int clirMode, UUSInfo uusInfo, Message result);



    /**

     *  returned message

     *  retMsg.obj = AsyncResult ar

telephony/java/com/android/internal/telephony/Connection.java

+7 −0
Original line number Diff line number Diff line
@@ -273,6 +273,13 @@ public abstract class Connection { 
     */

    public abstract int getNumberPresentation();



    /**

     * Returns the User to User Signaling (UUS) information associated with

     * incoming and waiting calls

     * @return UUSInfo containing the UUS userdata.

     */

    public abstract UUSInfo getUUSInfo();



    /**

     * Build a human representation of a connection instance, suitable for debugging.

     * Don't log personal stuff unless in debug mode.

telephony/java/com/android/internal/telephony/DriverCall.java

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ public class DriverCall implements Comparable { 
    public int numberPresentation;

    public String name;

    public int namePresentation;

    public UUSInfo uusInfo;



    /** returns null on error */

    static DriverCall

telephony/java/com/android/internal/telephony/Phone.java

+13 −0
Original line number Diff line number Diff line
@@ -788,6 +788,19 @@ public interface Phone { 
     */

    Connection dial(String dialString) throws CallStateException;



    /**

     * Initiate a new voice connection with supplementary User to User

     * Information. This happens asynchronously, so you cannot assume the audio

     * path is connected (or a call index has been assigned) until

     * PhoneStateChanged notification has occurred.

     *

     * @exception CallStateException if a new outgoing call is not currently

     *                possible because no more call slots exist or a call exists

     *                that is dialing, alerting, ringing, or waiting. Other

     *                errors are handled asynchronously.

     */

    Connection dial(String dialString, UUSInfo uusInfo) throws CallStateException;



    /**

     * Handles PIN MMI commands (PIN/PIN2/PUK/PUK2), which are initiated

     * without SEND (so <code>dial</code> is not appropriate).

telephony/java/com/android/internal/telephony/PhoneProxy.java

+4 −0
Original line number Diff line number Diff line
@@ -423,6 +423,10 @@ public class PhoneProxy extends Handler implements Phone { 
        return mActivePhone.dial(dialString);

    }



    public Connection dial(String dialString, UUSInfo uusInfo) throws CallStateException {

        return mActivePhone.dial(dialString, uusInfo);

    }



    public boolean handlePinMmi(String dialString) {

        return mActivePhone.handlePinMmi(dialString);

    }