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: f1f65ab7dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457502 Change-Id: Iad61cab6caf0aa5deb1871928a3d7a4c2b96b6f7
This commit is contained in: