diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-08-21 00:02:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 02:43:23 +0000 |
| commit | 38dd601d0abd92a9010aa8e894f6490b445f129b (patch) | |
| tree | 510353bf7bab760035e2b1ccc9d0a727407a34c5 /telecomm | |
| parent | c8f0ffa297d1d5d51c6fa60e7d7cd56a8bc91d1d (diff) | |
| parent | 1426048bd37907b5b50401f7242cddacdc3f024a (diff) | |
| download | frameworks_base-38dd601d0abd92a9010aa8e894f6490b445f129b.zip frameworks_base-38dd601d0abd92a9010aa8e894f6490b445f129b.tar.gz frameworks_base-38dd601d0abd92a9010aa8e894f6490b445f129b.tar.bz2 | |
Merge "Make AudioState modes static constants" into lmp-dev
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecomm/AudioState.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/telecomm/java/android/telecomm/AudioState.java b/telecomm/java/android/telecomm/AudioState.java index 491af14..a5fda79 100644 --- a/telecomm/java/android/telecomm/AudioState.java +++ b/telecomm/java/android/telecomm/AudioState.java @@ -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. */ |