Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark BluetoothClass#getClassOfDevice as TestApi"

Browse Source 
am: d5eff002eb

Change-Id: Ica748f534d65aa5ff2032e82e4b18c138610bdb1
This commit is contained in:
Ralph Nathan
2018-08-08 19:55:57 -07:00
committed by android-build-merger
parent 05f12d026d d5eff002eb
commit 045247ec3a
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/test-current.txt
View File

@@ -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 { package android.content {
public abstract class ContentResolver { public abstract class ContentResolver {

2
core/java/android/bluetooth/BluetoothClass.java
View File

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