summaryrefslogtreecommitdiff
path: root/core/java/android/bluetooth/BluetoothAdapter.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
commita722cefbdbb91c13d00129c24619580b4d549f8d (patch)
treeee7ce826a454d8ceae9d873ed1f4a92433d5de68 /core/java/android/bluetooth/BluetoothAdapter.java
parent6dbbed062069d7d39f26146565d0e6c86fdff58b (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 'core/java/android/bluetooth/BluetoothAdapter.java')
-rw-r--r--core/java/android/bluetooth/BluetoothAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index 291d1d99fdc9..8404705633c3 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -1642,7 +1642,7 @@ public final class BluetoothAdapter {
// Workaround for legacy API for getting a BluetoothAdapter not
// passing a context
if (mContext != null) {
- return null;
+ return mContext.getFeatureId();
}
return null;
}