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 /api | |
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 'api')
-rw-r--r-- | api/current.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 5159a3a..5b8ba4d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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; |