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

Commit ba473784 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add API for external call audio route."" into tm-dev am: 3005615f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16984773

Change-Id: I3da7bdc68ef793708f80789158a5dcc0e40bc7a1
parents 6523d42a 3005615f

core/api/current.txt

+0 −3
Original line number Diff line number Diff line
@@ -40022,7 +40022,6 @@ package android.telecom { 
    field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800

    field public static final int PROPERTY_RTT = 1024; // 0x400

    field public static final int PROPERTY_SELF_MANAGED = 256; // 0x100

    field public static final int PROPERTY_TETHERED_CALL = 32768; // 0x8000

    field public static final int PROPERTY_VOIP_AUDIO_MODE = 4096; // 0x1000

    field public static final int PROPERTY_WIFI = 8; // 0x8

  }
@@ -40051,7 +40050,6 @@ package android.telecom { 
    field @NonNull public static final android.os.Parcelable.Creator<android.telecom.CallAudioState> CREATOR;

    field public static final int ROUTE_BLUETOOTH = 2; // 0x2

    field public static final int ROUTE_EARPIECE = 1; // 0x1

    field public static final int ROUTE_EXTERNAL = 16; // 0x10

    field public static final int ROUTE_SPEAKER = 8; // 0x8

    field public static final int ROUTE_WIRED_HEADSET = 4; // 0x4

    field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
@@ -40326,7 +40324,6 @@ package android.telecom { 
    field public static final int PROPERTY_IS_RTT = 256; // 0x100

    field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 1024; // 0x400

    field public static final int PROPERTY_SELF_MANAGED = 128; // 0x80

    field public static final int PROPERTY_TETHERED_CALL = 16384; // 0x4000

    field public static final int PROPERTY_WIFI = 8; // 0x8

    field public static final int STATE_ACTIVE = 4; // 0x4

    field public static final int STATE_DIALING = 3; // 0x3

telecomm/java/android/telecom/Call.java

+1 −11
Original line number Diff line number Diff line
@@ -701,15 +701,8 @@ public final class Call { 
         */

        public static final int PROPERTY_CROSS_SIM = 0x00004000;



        /**

         * Connection is a tethered external call.

         * Indicates that the {@link Connection} is fixed on this device but the audio streams are

         * re-routed to another device.

         */

        public static final int PROPERTY_TETHERED_CALL = 0x00008000;



        //******************************************************************************************

        // Next PROPERTY value: 0x00010000

        // Next PROPERTY value: 0x00004000

        //******************************************************************************************



        private final @CallState int mState;
@@ -906,9 +899,6 @@ public final class Call { 
            if (hasProperty(properties, PROPERTY_CROSS_SIM)) {

                builder.append(" PROPERTY_CROSS_SIM");

            }

            if (hasProperty(properties, PROPERTY_TETHERED_CALL)) {

                builder.append(" PROPERTY_TETHERED_CALL");

            }

            builder.append("]");

            return builder.toString();

        }

telecomm/java/android/telecom/CallAudioState.java

+4 −15
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.Parcelable; 
import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.Collections;

import java.util.List;
@@ -41,8 +42,7 @@ import java.util.stream.Collectors; 
public final class CallAudioState implements Parcelable {

    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(value = {ROUTE_EARPIECE, ROUTE_BLUETOOTH, ROUTE_WIRED_HEADSET, ROUTE_SPEAKER,

            ROUTE_EXTERNAL},

    @IntDef(value={ROUTE_EARPIECE, ROUTE_BLUETOOTH, ROUTE_WIRED_HEADSET, ROUTE_SPEAKER},

            flag=true)

    public @interface CallAudioRoute {}
@@ -58,9 +58,6 @@ public final class CallAudioState implements Parcelable { 
    /** Direct the audio stream through the device's speakerphone. */

    public static final int ROUTE_SPEAKER       = 0x00000008;



    /** Direct the audio stream through another device. */

    public static final int ROUTE_EXTERNAL       = 0x00000010;



    /**

     * Direct the audio stream through the device's earpiece or wired headset if one is

     * connected.
@@ -73,7 +70,7 @@ public final class CallAudioState implements Parcelable { 
     * @hide

     **/

    public static final int ROUTE_ALL = ROUTE_EARPIECE | ROUTE_BLUETOOTH | ROUTE_WIRED_HEADSET |

            ROUTE_SPEAKER | ROUTE_EXTERNAL;

            ROUTE_SPEAKER;



    private final boolean isMuted;

    private final int route;
@@ -192,12 +189,8 @@ public final class CallAudioState implements Parcelable { 
     */

    @CallAudioRoute

    public int getSupportedRouteMask() {

        if (route == ROUTE_EXTERNAL) {

            return ROUTE_EXTERNAL;

        } else {

        return supportedRouteMask;

    }

    }



    /**

     * @return The {@link BluetoothDevice} through which audio is being routed.
@@ -240,10 +233,6 @@ public final class CallAudioState implements Parcelable { 
            listAppend(buffer, "SPEAKER");

        }



        if ((route & ROUTE_EXTERNAL) == ROUTE_EXTERNAL) {

            listAppend(buffer, "EXTERNAL");

        }



        return buffer.toString();

    }

telecomm/java/android/telecom/Connection.java

+0 −9
Original line number Diff line number Diff line
@@ -561,15 +561,6 @@ public abstract class Connection extends Conferenceable { 
     */

    public static final int PROPERTY_CROSS_SIM = 1 << 13;



    /**

     * Connection is a tethered external call.

     * <p>

     * Indicates that the {@link Connection} is fixed on this device but the audio streams are

     * re-routed to another device.

     * <p>

     */

    public static final int PROPERTY_TETHERED_CALL = 1 << 14;



    //**********************************************************************************************

    // Next PROPERTY value: 1<<14

    //**********************************************************************************************