Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make AudioState modes static constants" into lmp-dev

Browse Source
This commit is contained in:
Yorke Lee
2014-08-21 00:02:55 +00:00
committed by Android (Google) Code Review
parent c8f0ffa297 1426048bd3
commit 38dd601d0a
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/current.txt
View File

@@ -28490,12 +28490,12 @@ package android.telecomm {
method public int describeContents();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
field public static int ROUTE_ALL;
field public static int ROUTE_BLUETOOTH;
field public static int ROUTE_EARPIECE;
field public static int ROUTE_SPEAKER;
field public static int ROUTE_WIRED_HEADSET;
field public static int ROUTE_WIRED_OR_EARPIECE;
field public static final int ROUTE_ALL = 15; // 0xf
field public static final int ROUTE_BLUETOOTH = 2; // 0x2
field public static final int ROUTE_EARPIECE = 1; // 0x1
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
field public final boolean isMuted;
field public final int route;
field public final int supportedRouteMask;

12
telecomm/java/android/telecomm/AudioState.java
View File

@@ -26,25 +26,25 @@ import java.util.Locale;
*/
public final class AudioState implements Parcelable {
/** Direct the audio stream through the device's earpiece. */
public static int ROUTE_EARPIECE = 0x00000001;
public static final int ROUTE_EARPIECE = 0x00000001;
/** Direct the audio stream through Bluetooth. */
public static int ROUTE_BLUETOOTH = 0x00000002;
public static final int ROUTE_BLUETOOTH = 0x00000002;
/** Direct the audio stream through a wired headset. */
public static int ROUTE_WIRED_HEADSET = 0x00000004;
public static final int ROUTE_WIRED_HEADSET = 0x00000004;
/** Direct the audio stream through the device's spakerphone. */
public static int ROUTE_SPEAKER = 0x00000008;
public static final int ROUTE_SPEAKER = 0x00000008;
/**
* Direct the audio stream through the device's earpiece or wired headset if one is
* connected.
*/
public static int ROUTE_WIRED_OR_EARPIECE = ROUTE_EARPIECE | ROUTE_WIRED_HEADSET;
public static final int ROUTE_WIRED_OR_EARPIECE = ROUTE_EARPIECE | ROUTE_WIRED_HEADSET;
/** Bit mask of all possible audio routes. */
public static int ROUTE_ALL = ROUTE_EARPIECE | ROUTE_BLUETOOTH | ROUTE_WIRED_HEADSET |
public static final int ROUTE_ALL = ROUTE_EARPIECE | ROUTE_BLUETOOTH | ROUTE_WIRED_HEADSET |
ROUTE_SPEAKER;
/** True if the call is muted, false otherwise. */