Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9edd4fb authored by Ralph Nathan's avatar Ralph Nathan Committed by android-build-merger
Browse files

Merge "Mark BluetoothClass#getClassOfDevice as TestApi" am: d5eff002

am: 045247ec

Change-Id: Ic486c4a7c612da799a851d73edbb1e8fd339797f
parents eb087e6e 045247ec
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -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 {
+2 −0
Original line number Diff line number Diff line
@@ -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;
    }