summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorIhab Awad <ihab@google.com>2014-12-05 19:39:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-05 19:39:19 +0000
commit710e20d22516a896c3560d96fdec423ffa0d154e (patch)
treeca33c02e46998d89d6c5c01364832d43a8434abd /telecomm
parent4ca9d738fa3961507a0289cb4e7873701bc04e12 (diff)
parentc047bd464b70f64ac2839c8d04e00c7ae4a66bfb (diff)
downloadframeworks_base-710e20d22516a896c3560d96fdec423ffa0d154e.zip
frameworks_base-710e20d22516a896c3560d96fdec423ffa0d154e.tar.gz
frameworks_base-710e20d22516a896c3560d96fdec423ffa0d154e.tar.bz2
Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecom/AudioState.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/telecomm/java/android/telecom/AudioState.java b/telecomm/java/android/telecom/AudioState.java
index 3271ebf..9c03319 100644
--- a/telecomm/java/android/telecom/AudioState.java
+++ b/telecomm/java/android/telecom/AudioState.java
@@ -54,14 +54,14 @@ public final class AudioState implements Parcelable {
public static final int ROUTE_ALL = ROUTE_EARPIECE | ROUTE_BLUETOOTH | ROUTE_WIRED_HEADSET |
ROUTE_SPEAKER;
- /** @hide */
- @Deprecated public final boolean isMuted;
+ /** Note: Deprecated, please do not use if possible. */
+ @SystemApi public final boolean isMuted;
- /** @hide */
- @Deprecated public final int route;
+ /** Note: Deprecated, please do not use if possible. */
+ @SystemApi public final int route;
- /** @hide */
- @Deprecated public final int supportedRouteMask;
+ /** Note: Deprecated, please do not use if possible. */
+ @SystemApi public final int supportedRouteMask;
public AudioState(boolean muted, int route, int supportedRouteMask) {
this.isMuted = muted;