commit | 1fda5f6890f13bae525d250b387da419df097651 | [log] [tgz] |
---|---|---|
author | Rahul Sabnis <rahulsabnis@google.com> | Thu May 20 04:21:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 20 04:21:25 2021 +0000 |
tree | 7a542e7d9cd2491d426c964d09bc9b14f8f15d2a | |
parent | 22d57bf4ab31ad8e0f1abe5d69b230f9c887ed01 [diff] | |
parent | 133f9e4da448956ee31c076fd7491fa224eb3ce8 [diff] |
Merge "Update BluetoothDevice#setAlias based on API council feedback: now accepts null input and returns an int (with error codes). Update CompanionDeviceManager#canPairWithoutPrompt to take a UserHandle instead of an int. Adds BluetoothStatusCodes class for all new Bluetooth error / success codes. Moved OOB and hci disconnect constants to the new BluetoothStatusCodes class." into sc-dev am: b8cfbebbec am: 423ee1c59f am: 133f9e4da4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457502 Change-Id: I25073728ce8966671722951b265ee9a6132308d8