commit df228e3128aa2ced94bad7f195e2f42a2b85bf7b
author Android Build Merger (Role) <android-build-merger@google.com> Wed Mar 01 01:11:50 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 01 01:11:54 2017 +0000
tree 0f9898893e2f7d642b06642df34d9a017c0ab814
parent 247a3c01326fbcd4e12270b5a2d4fb42fa78e7c6
parent 91300fba36187b151c3d9f32be84add630807c11

Merge "Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377 am: c284379659 am: f000639f82"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 83ba79d..433f2ed 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -38180,9 +38180,6 @@
     field public static final int RTT_MODE_VCO = 3; // 0x3
   }
 
-  public static abstract class Call.RttCall.RttAudioMode implements java.lang.annotation.Annotation {
-  }
-
   public final class CallAudioState implements android.os.Parcelable {
     ctor public CallAudioState(boolean, int, int);
     method public static java.lang.String audioRouteToString(int);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 0e26982..3165aac 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -41230,9 +41230,6 @@
     field public static final int RTT_MODE_VCO = 3; // 0x3
   }
 
-  public static abstract class Call.RttCall.RttAudioMode implements java.lang.annotation.Annotation {
-  }
-
   public final class CallAudioState implements android.os.Parcelable {
     ctor public CallAudioState(boolean, int, int);
     method public static java.lang.String audioRouteToString(int);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index cc99875..5fc7af6 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -38364,9 +38364,6 @@
     field public static final int RTT_MODE_VCO = 3; // 0x3
   }
 
-  public static abstract class Call.RttCall.RttAudioMode implements java.lang.annotation.Annotation {
-  }
-
   public final class CallAudioState implements android.os.Parcelable {
     ctor public CallAudioState(boolean, int, int);
     method public static java.lang.String audioRouteToString(int);

telecomm/java/android/telecom/Call.java

diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index 4295d40..3f7c908 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -878,6 +878,7 @@
      * party, if it is active.
      */
     public static final class RttCall {
+        /** @hide */
         @Retention(RetentionPolicy.SOURCE)
         @IntDef({RTT_MODE_INVALID, RTT_MODE_FULL, RTT_MODE_HCO, RTT_MODE_VCO})
         public @interface RttAudioMode {}