Rahul Sabnis 84099ebb3a 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: I95cf43cf2f36a6e87c7564070ea48c0ee7661f77

2021-05-19 16:23:29 +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

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

jni

Merge "Check mInputEventReceiver before sending timeline -- 2" into sc-dev am: 234adf7cb2

2021-05-17 17:45:10 +00:00

proto

Add feature id, isRootDisplayArea, isOrganized to DisplayArea dump

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

res

Merge "Tidy configuration associated with geotz" into sc-dev am: 8168766af7

2021-05-19 08:46:49 +00:00

sysprop

…

tests

Merge "Connect ColorStateList to CAM" into sc-dev

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

xsd

…

TEST_MAPPING

…