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

Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable" am: b4dbfff366 am: 5a607f2666

Browse Source 
Change-Id: Icde5c7bccb2e7f4f5a8ae9e44d8a44dcce0234f7
This commit is contained in:
Automerger Merge Worker
2020-01-22 21:35:27 +00:00
parent 3ee27a2d7b 5a607f2666
commit 8371addcb4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -1222,6 +1222,7 @@ public final class BluetoothAdapter {
if (mService != null) {
return mService.factoryReset();
}
Log.e(TAG, "factoryReset(): IBluetooth Service is null");
SystemProperties.set("persist.bluetooth.factoryreset", "true");
} catch (RemoteException e) {
Log.e(TAG, "", e);
@@ -1239,7 +1240,7 @@ public final class BluetoothAdapter {
*/
@UnsupportedAppUsage
@RequiresPermission(Manifest.permission.BLUETOOTH)
public @NonNull ParcelUuid[] getUuids() {
public @Nullable ParcelUuid[] getUuids() {
if (getState() != STATE_ON) {
return null;
}