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

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

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

Merge "Mark BluetoothClass#getClassOfDevice as TestApi" am: d5eff002 am: 045247ec am: b9edd4fb
am: 07fe5664

Change-Id: I79e8943ff3ec4791b40eebdf991e71a0935e377b
parents d8906d8a 07fe5664

api/test-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -228,6 +228,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

+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;

    }