Rahul Sabnis f1f65ab7dc 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 ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457502

Change-Id: I0cc8db6af04a343bb520176fbe8bd3a26780065b

2021-05-19 16:24:50 +00:00

..

api

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

2021-05-19 16:00:04 +00:00

java

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

2021-05-19 16:24:50 +00:00

jni

Merge "Check mInputEventReceiver before sending timeline -- 2" into sc-dev

2021-05-17 17:35:24 +00:00

proto

Add feature id, isRootDisplayArea, isOrganized to DisplayArea dump

2021-05-13 23:54:36 -07:00

res

Add <staging-public-group> tags to SV2

2021-05-19 09:08:39 +00:00

sysprop

…

tests

Merge "Connect ColorStateList to CAM" into sc-dev

2021-05-18 23:44:22 +00:00

xsd

…

TEST_MAPPING

…