diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-15 02:14:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-15 02:14:48 +0000 |
| commit | 8cd63de3e57ef42c682f8dfa9dd15aa15be7d5ab (patch) | |
| tree | 0649066f7fccc4b8570738e2f52c4c094c802d56 /framework/java/android/bluetooth/OobData.java | |
| parent | 0a4a7358faf196e3415319648e677f32f469f40b (diff) | |
| parent | 4829eb69dfb25bb9190bf8f6cb6680533efb17a8 (diff) | |
Merge "Bluetooth OOB: Fix getLeAppearance" am: ef0304a087 am: 4829eb69df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673875
Change-Id: I8128fda817ab902cdf760acb731316f49faf07b2
Diffstat (limited to 'framework/java/android/bluetooth/OobData.java')
| -rw-r--r-- | framework/java/android/bluetooth/OobData.java | 2 |
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; } /** |