Merge "Mark BluetoothClass#getClassOfDevice as TestApi" am: d5eff002eb am: 045247ec3a

am: b9edd4fbc4

Change-Id: I53f733cf18a6802f2841d12a9d78f7203c0724c7

api/test-current.txt

@@ -215,6 +215,14 @@ package android.app.usage {
 
 }
 
+package android.bluetooth {
+
+  public final class BluetoothClass implements android.os.Parcelable {
+    method public int getClassOfDevice();
+  }
+
+}
+
 package android.content {
 
   public abstract class ContentResolver {

core/java/android/bluetooth/BluetoothClass.java

@@ -16,6 +16,7 @@
 
 package android.bluetooth;
 
+import android.annotation.TestApi;
 import android.annotation.UnsupportedAppUsage;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -293,6 +294,7 @@ public final class BluetoothClass implements Parcelable {
      *
      * @hide
      */
+    @TestApi
     public int getClassOfDevice() {
         return mClass;
     }