summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/OobData.java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-04-15 01:23:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-15 01:23:58 +0000
commit4829eb69dfb25bb9190bf8f6cb6680533efb17a8 (patch)
tree0649066f7fccc4b8570738e2f52c4c094c802d56 /framework/java/android/bluetooth/OobData.java
parentd3d0334f1be5d08545dbd32a97e5192da038191f (diff)
parentc8353bb6d89b2fb286e02907570d4dcc4169d4ff (diff)
Merge "Bluetooth OOB: Fix getLeAppearance" am: ef0304a087
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673875 Change-Id: Ibb7c52a0d373644f811fdc4e095c5577efd510ce
Diffstat (limited to 'framework/java/android/bluetooth/OobData.java')
-rw-r--r--framework/java/android/bluetooth/OobData.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/OobData.java b/framework/java/android/bluetooth/OobData.java
index 08d694eb93..d6868e0ffd 100644
--- a/framework/java/android/bluetooth/OobData.java
+++ b/framework/java/android/bluetooth/OobData.java
@@ -830,7 +830,7 @@ public final class OobData implements Parcelable {
@Nullable
@SystemApi
public byte[] getLeAppearance() {
- return mLeTemporaryKey;
+ return mLeAppearance;
}
/**