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

Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled" am: bd4031de4a

Browse Source 
am: 2fb54515a2

Change-Id: Id6f1c11c447ff1896b5df81a7625a643ecebce46
This commit is contained in:
Zach Johnson
2019-12-06 15:34:45 -08:00
committed by android-build-merger
parent 405e5f3c15 2fb54515a2
commit b39a419fa4
3 changed files with 9 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -862,18 +862,7 @@ public final class BluetoothAdapter {
*/
@RequiresPermission(Manifest.permission.BLUETOOTH)
public boolean isEnabled() {
try {
mServiceLock.readLock().lock();
if (mService != null) {
return mService.isEnabled();
}
} catch (RemoteException e) {
Log.e(TAG, "", e);
} finally {
mServiceLock.readLock().unlock();
}
return false;
return getState() == BluetoothAdapter.STATE_ON;
}
/**

35
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -1149,20 +1149,7 @@ public final class BluetoothDevice implements Parcelable {
*/
@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
public boolean createBond() {
final IBluetooth service = sService;
if (service == null) {
Log.e(TAG, "BT not enabled. Cannot create bond to Remote Device");
return false;
}
try {
Log.i(TAG, "createBond() for device " + getAddress()
+ " called by pid: " + Process.myPid()
+ " tid: " + Process.myTid());
return service.createBond(this, TRANSPORT_AUTO);
} catch (RemoteException e) {
Log.e(TAG, "", e);
}
return false;
return createBond(TRANSPORT_AUTO);
}
/**
@@ -1183,23 +1170,7 @@ public final class BluetoothDevice implements Parcelable {
*/
@UnsupportedAppUsage
public boolean createBond(int transport) {
final IBluetooth service = sService;
if (service == null) {
Log.e(TAG, "BT not enabled. Cannot create bond to Remote Device");
return false;
}
if (TRANSPORT_AUTO > transport || transport > TRANSPORT_LE) {
throw new IllegalArgumentException(transport + " is not a valid Bluetooth transport");
}
try {
Log.i(TAG, "createBond() for device " + getAddress()
+ " called by pid: " + Process.myPid()
+ " tid: " + Process.myTid());
return service.createBond(this, transport);
} catch (RemoteException e) {
Log.e(TAG, "", e);
}
return false;
return createBondOutOfBand(transport, null);
}
/**
@@ -1227,7 +1198,7 @@ public final class BluetoothDevice implements Parcelable {
return false;
}
try {
return service.createBondOutOfBand(this, transport, oobData);
return service.createBond(this, transport, oobData);
} catch (RemoteException e) {
Log.e(TAG, "", e);
}

37
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -613,22 +613,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
}
public boolean isEnabled() {
if ((Binder.getCallingUid() != Process.SYSTEM_UID) && (!checkIfCallerIsForegroundUser())) {
Slog.w(TAG, "isEnabled(): not allowed for non-active and non system user");
return false;
}
try {
mBluetoothLock.readLock().lock();
if (mBluetooth != null) {
return mBluetooth.isEnabled();
}
} catch (RemoteException e) {
Slog.e(TAG, "isEnabled()", e);
} finally {
mBluetoothLock.readLock().unlock();
}
return false;
return getState() == BluetoothAdapter.STATE_ON;
}
public int getState() {
@@ -1766,14 +1751,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
//Do enable request
try {
if (!mQuietEnable) {
if (!mBluetooth.enable()) {
Slog.e(TAG, "IBluetooth.enable() returned false");
}
} else {
if (!mBluetooth.enableNoAutoConnect()) {
Slog.e(TAG, "IBluetooth.enableNoAutoConnect() returned false");
}
if (!mBluetooth.enable(mQuietEnable)) {
Slog.e(TAG, "IBluetooth.enable() returned false");
}
} catch (RemoteException e) {
Slog.e(TAG, "Unable to call enable()", e);
@@ -2048,14 +2027,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
} else if (mBluetooth != null) {
//Enable bluetooth
try {
if (!mQuietEnable) {
if (!mBluetooth.enable()) {
Slog.e(TAG, "IBluetooth.enable() returned false");
}
} else {
if (!mBluetooth.enableNoAutoConnect()) {
Slog.e(TAG, "IBluetooth.enableNoAutoConnect() returned false");
}
if (!mBluetooth.enable(mQuietEnable)) {
Slog.e(TAG, "IBluetooth.enable() returned false");
}
} catch (RemoteException e) {
Slog.e(TAG, "Unable to call enable()", e);