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

Merge changes from topic "bt_get_cod"

Browse Source 
am: 35dc02004c

Change-Id: Iec67ef3cc9c990b4d5285b23b51972915cbbd335
This commit is contained in:
Pulkit Bhuwalka
2017-10-24 06:27:23 +00:00
committed by android-build-merger
parent b977674b17 35dc02004c
commit 178e5873b0
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1133,6 +1133,28 @@ public final class BluetoothAdapter {
return false; return false;
} }
/**
* Returns the {@link BluetoothClass} Bluetooth Class of Device (CoD) of the local Bluetooth
* adapter.
*
* @return {@link BluetoothClass} Bluetooth CoD of local Bluetooth device.
*
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
public BluetoothClass getBluetoothClass() {
if (getState() != STATE_ON) return null;
try {
mServiceLock.readLock().lock();
if (mService != null) return mService.getBluetoothClass();
} catch (RemoteException e) {
Log.e(TAG, "", e);
} finally {
mServiceLock.readLock().unlock();
}
return null;
}
/** /**
* Sets the {@link BluetoothClass} Bluetooth Class of Device (CoD) of the local Bluetooth * Sets the {@link BluetoothClass} Bluetooth Class of Device (CoD) of the local Bluetooth
* adapter. * adapter.

8
core/res/AndroidManifest.xml
View File

@@ -181,10 +181,18 @@
android:name="android.bluetooth.a2dp-sink.profile.action.PLAYING_STATE_CHANGED" /> android:name="android.bluetooth.a2dp-sink.profile.action.PLAYING_STATE_CHANGED" />
<protected-broadcast <protected-broadcast
android:name="android.bluetooth.a2dp-sink.profile.action.AUDIO_CONFIG_CHANGED" /> android:name="android.bluetooth.a2dp-sink.profile.action.AUDIO_CONFIG_CHANGED" />
<protected-broadcast
android:name="android.bluetooth.avrcp-controller.profile.action.BROWSE_CONNECTION_STATE_CHANGED" />
<protected-broadcast <protected-broadcast
android:name="android.bluetooth.avrcp-controller.profile.action.CONNECTION_STATE_CHANGED" /> android:name="android.bluetooth.avrcp-controller.profile.action.CONNECTION_STATE_CHANGED" />
<protected-broadcast
android:name="android.bluetooth.avrcp-controller.profile.action.FOLDER_LIST" />
<protected-broadcast
android:name="android.bluetooth.avrcp-controller.profile.action.TRACK_EVENT" />
<protected-broadcast <protected-broadcast
android:name="android.bluetooth.input.profile.action.CONNECTION_STATE_CHANGED" /> android:name="android.bluetooth.input.profile.action.CONNECTION_STATE_CHANGED" />
<protected-broadcast
android:name="android.bluetooth.input.profile.action.IDLE_TIME_CHANGED" />
<protected-broadcast <protected-broadcast
android:name="android.bluetooth.input.profile.action.PROTOCOL_MODE_CHANGED" /> android:name="android.bluetooth.input.profile.action.PROTOCOL_MODE_CHANGED" />
<protected-broadcast <protected-broadcast