summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothManager.java
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2019-11-15 12:41:09 -0800
committerPhilip P. Moltmann <moltmann@google.com>2019-12-14 10:38:19 -0800
commita188ac2ea6791550982fa6a3bf3636eb0d050b80 (patch)
tree4b4382a6f8d465a2c284d16156c1b047cc03e0ee /framework/java/android/bluetooth/BluetoothManager.java
parent405007e2bb35675edd00c76bb9a051a02d0b076e (diff)
Pipe featureId from app to noteOp in BT code
Test: atest CtsAppOpsTestCases (Now with canary test for this code) Bug: 136595429 Change-Id: I90bb6b017da4f03038fce76760a860390b727f00
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothManager.java b/framework/java/android/bluetooth/BluetoothManager.java
index cff4c2d75d..7ff6466334 100644
--- a/framework/java/android/bluetooth/BluetoothManager.java
+++ b/framework/java/android/bluetooth/BluetoothManager.java
@@ -62,7 +62,7 @@ public final class BluetoothManager {
* @hide
*/
public BluetoothManager(Context context) {
- if (null == null) {
+ if (context.getFeatureId() == null) {
context = context.getApplicationContext();
if (context == null) {
throw new IllegalArgumentException(