Commit Graph

1752 Commits

Author SHA1 Message Date
Treehugger Robot
e5521528e4 Merge "Register the service-to-app callback whenever the service comes up for BluetoothConnectionCallback. This ensures that if the bluetooth process dies, the callbacks will be re-established once it comes back up." am: 0aa6ab7887 am: 7d10fee593 am: 5e50fd7970
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533089

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2489c4307aa21cf42cfae55ed7024ef9109bf1a
2020-12-22 07:04:59 +00:00
Treehugger Robot
5e50fd7970 Merge "Register the service-to-app callback whenever the service comes up for BluetoothConnectionCallback. This ensures that if the bluetooth process dies, the callbacks will be re-established once it comes back up." am: 0aa6ab7887 am: 7d10fee593
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533089

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic60e9efe84a5009c7fd0112c8ab92cae2973d77c
2020-12-21 21:58:44 +00:00
Treehugger Robot
0aa6ab7887 Merge "Register the service-to-app callback whenever the service comes up for BluetoothConnectionCallback. This ensures that if the bluetooth process dies, the callbacks will be re-established once it comes back up." 2020-12-21 20:56:26 +00:00
Rahul Sabnis
9fc40b34c3 Register the service-to-app callback whenever the service comes up for
BluetoothConnectionCallback. This ensures that if the bluetooth process
dies, the callbacks will be re-established once it comes back up.

Tag: #feature
Bug: 175700972
Test: Manual
Change-Id: I2a20b229fcc1d8f69ccc1b24b62c26ce8155c29f
2020-12-17 12:23:23 -08:00
Jakub Pawlowski
22e6db8761 Merge "Add LE Audio UUID placeholder" am: eec09803da am: b253796204 am: 14b8b7fca2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idaf4c83bbb85c8815b4988e8ba75bd7c94c2a8bd
2020-12-15 22:50:39 +00:00
Jakub Pawlowski
14b8b7fca2 Merge "Add LE Audio UUID placeholder" am: eec09803da am: b253796204
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0461b86760f5c26bf066799b8bf6452ac2162704
2020-12-15 22:12:21 +00:00
Jakub Pawlowski
eec09803da Merge "Add LE Audio UUID placeholder" 2020-12-15 21:54:45 +00:00
Jakub Pawlowski
224146d50d Add LE Audio UUID placeholder
Actual value will will be added in the future. We already have to
reference it in the source.

Bug: 150670922
Test: compilation
Tag: #feature
Sponsor: jpawlowski@
Change-Id: I3ba1e0e1136346e469952568f5a409cf32b898be
2020-12-15 09:09:31 +00:00
Jeff Sharkey
0ab7007631 resolve merge conflicts of 358f0d4fc8 to master
Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c
2020-12-08 11:01:05 -07:00
Jeff Sharkey
24d251403b Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c am: c7c4a74a78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5120a3701af3564f363900b20bca75f3ad2a854c
2020-12-08 16:43:17 +00:00
Jeff Sharkey
fab0ab3c9c Improve OWNERS coverage across frameworks/base/.
As general background, OWNERS files expedite code reviews by helping
code authors quickly find relevant reviewers, and they also ensure
that stakeholders are involved in code changes in their areas.

Some teams under frameworks/base/ have been using OWNERS files
successfully for many years, and we're ready to expand them to cover
more areas.  Here's the historical coverage statistics for the last
two years of changes before these new OWNERS changes land:

-- 56% of changes are fully covered by OWNERS
-- 17% of changes are partially covered by OWNERS
-- 25% of changes have no OWNERS coverage

Working closely with team leads, we've now identified clear OWNERS on
a per-package basis, and we're using "include" directives whenever
possible to to simplify future maintenance.  With this extensive
effort, we've now improved our coverage as follows:

-- 98% of changes are fully covered by OWNERS
-- 1% of changes are partially covered by OWNERS
-- 1% of changes have no OWNERS coverage

This specific change is automatically generated by a script from
detailed ownership information confirmed by team leads.

Bug: 174932174
Test: manual
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Merged-In: I9789c97c1de8e5d962b48c29c57d82fe83729eba
Change-Id: I9789c97c1de8e5d962b48c29c57d82fe83729eba
2020-12-08 08:36:27 -07:00
TreeHugger Robot
1ae8c3ec86 Merge "Store CDM device profile and apply role when device is connected" 2020-12-07 21:21:32 +00:00
Eugene Susla
151da5b2bc Store CDM device profile and apply role when device is connected
Test: manual - ensure role privileges are granted/revoked when device is connected/disconnected
Bug: 165951651
Change-Id: Id24a4b3a3510781d9105763b1722f44583a7fd7c
2020-12-04 15:56:50 -08:00
Treehugger Robot
9644c55402 Merge "BluetoothClass: Use mask to get MajorDeviceClass" am: a9f7570de6 am: 9fa0668d29 am: e1271704a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1516221

Change-Id: If4788ee4e28ee9a7dc571eea1ca15f751e2611ef
2020-12-03 21:23:48 +00:00
Treehugger Robot
e1271704a9 Merge "BluetoothClass: Use mask to get MajorDeviceClass" am: a9f7570de6 am: 9fa0668d29
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1516221

Change-Id: I9b320189fa9bcfac4f23e2bda4452c399cf75f9d
2020-12-03 20:23:51 +00:00
Myles Watson
89bf39528f BluetoothClass: Use mask to get MajorDeviceClass
Bug: 174650196
Test: compiles
Change-Id: I6042a02fa329c5291aa7b9719907485e748582bf
2020-12-02 20:48:08 -08:00
Jakub Pawlowski
ddf3f6a122 Merge "Add Bluetooth LE Audio Profile (3/3)" am: dfe8d9caed am: cc691aa7ac am: 53f60a1e18
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511334

Change-Id: I12b76d5afd51a0757a4e1b7db926b9744352300e
2020-12-02 09:58:32 +00:00
Jakub Pawlowski
53f60a1e18 Merge "Add Bluetooth LE Audio Profile (3/3)" am: dfe8d9caed am: cc691aa7ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511334

Change-Id: I6c0bdeabe486dc6eed942193984922ba5e00024b
2020-12-02 08:57:33 +00:00
Grzegorz Kołodziejczyk
f08f986a9b Add Bluetooth LE Audio Profile (3/3)
This is boilerplate code for Bluetooth LE Audio profile

Bug: 150670922
Test: compilation
Tag: #feature
Change-Id: Iadc3af12fd8b2808db2f4e933a1906a819824ade
2020-12-01 23:30:49 +01:00
Mathew Inwood
efdfea6d99 De-restrict BluetoothCodecStatus hidden APIs.
They were erroneously included in b/170729553 but should not have been.

Tag: #feature
Test: Manual
Change-Id: Ia3bd3b55de19a89d41a025dc0e03dec850c1ab07
2020-11-21 00:01:40 +00:00
Mathew Inwood
5d123b6775 Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

Bug: 170729553
Test: Treehugger
Merged-In: I626caf7c1fe46c5ab1f39c2895b42a34319f771a
Change-Id: I54e5ecd11e76ca1de3c5893e3a98b0108e735413
2020-11-04 09:45:53 +00:00
Mathew Inwood
5f0edaaaf5 Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

Bug: 170729553
Test: Treehugger
Merged-In: I8285daa8530260251ecad6f3f38f98e263629ca7
Change-Id: I626caf7c1fe46c5ab1f39c2895b42a34319f771a
2020-11-02 10:30:09 +00:00
Automerger Merge Worker
9f2fd7efc7 Merge "Merge "Introduce a BluetoothConnectionCallback that will fire off events when a device is connected or disconnected." am: 917b0a4488 am: 4d0e0a264b am: a85edfaf40" into rvc-qpr-dev-plus-aosp am: 9ee26c4355
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478819

Change-Id: Ic5579ebc90f8a23b799c96704756938ca667a23e
2020-10-30 04:09:25 +00:00
Treehugger Robot
a85edfaf40 Merge "Introduce a BluetoothConnectionCallback that will fire off events when a device is connected or disconnected." am: 917b0a4488 am: 4d0e0a264b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478819

Change-Id: I05b230a04ccc2ca43e06246bbab68e6c173a1183
2020-10-30 03:29:31 +00:00
Treehugger Robot
917b0a4488 Merge "Introduce a BluetoothConnectionCallback that will fire off events when a device is connected or disconnected." 2020-10-30 02:34:25 +00:00
Rahul Sabnis
79ce82f840 Introduce a BluetoothConnectionCallback that will fire off events when a
device is connected or disconnected.

Tag: #feature
Bug: 171902843
Test: Manual
Change-Id: I194a35a69fe0c5d960ea88a1a0fa52c8df7738e2
2020-10-29 16:51:26 -07:00
Mathew Inwood
8e742f928e Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

This is a resubmit of ag/12929664 with some APIs excluded that caused
test failures; see bugs 171886397, 171888296, 171864568.

APIs excluded:
Landroid/bluetooth/le/ScanRecord;->parseFromBytes([B)Landroid/bluetooth/le/ScanRecord;
Landroid/os/Process;->myPpid()I
Landroid/os/SharedMemory;->getFd()I
Landroid/hardware/input/InputManager;->INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH:I

Bug: 170729553
Test: Treehugger
Change-Id: I8285daa8530260251ecad6f3f38f98e263629ca7
2020-10-29 11:51:12 +00:00
Treehugger Robot
0207b41506 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." am: 5ba504f179 am: 09b112ff93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444676

Change-Id: I0eee659fed87c632038e976f5a592515fe4b54e3
2020-10-29 01:22:31 +00:00
Hongwei Wang
050275cd83 Revert "Add maxTargetSdk restriction to unused APIs."
This reverts commit 72f07d6a8a.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?testMethod=testAppZygotePreload&testClass=android.app.cts.ServiceTest&atpConfigName=suite%2Ftest-mapping-presubmit-retry_cloud-tf&testModule=CtsAppTestCases&fkbb=6936597&lkbb=6936969&lkgb=6936551&testResults=true&branch=git_master&target=cf_x86_phone-userdebug>, bug b/171886397

Bug: 171886397
Change-Id: Ibe0f0430a3451477c1ee8ef56a596e91ea1e7672
2020-10-28 20:16:22 +00:00
Treehugger Robot
5ba504f179 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." 2020-10-28 19:44:40 +00:00
Rahul Sabnis
57835f979c Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from
the non-SDK API list to the blocklist in Android 11 back to the non-SDK
API list.

Tag: #feature
Bug: 168812851
Test: atest BluetoothHostTest#testCodecMethodsAccessible
Merged-In: I29983284b1a1c271d983c99b286e204604abdc72
Change-Id: I29983284b1a1c271d983c99b286e204604abdc72
2020-10-28 18:35:25 +00:00
Mathew Inwood
72f07d6a8a Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

Bug: 170729553
Test: Treehugger
Change-Id: I4c8fd0006f950de9955242e93968fb0996ceb372
2020-10-27 15:46:07 +00:00
Kevin Hufnagle
41f955e8b6 Merge "docs: Use correct profile for intent" into rvc-dev am: b7eef50878 am: dc4f87a3ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12879988

Change-Id: Ia29277f79e0235194c592a6f60cec35bd59f9442
2020-10-22 09:46:41 +00:00
Kevin Hufnagle
c841e87526 Merge "docs: Use correct profile for intent" into rvc-dev am: b7eef50878 am: 63314714e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12879988

Change-Id: Ifb153b103c7a0a014f05e3b5d38fe91da1e29d38
2020-10-22 08:01:16 +00:00
Kevin Hufnagle
63314714e0 Merge "docs: Use correct profile for intent" into rvc-dev am: b7eef50878
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12879988

Change-Id: If6942c2427842d2445e02a3e3281c41fb4d16fe1
2020-10-22 06:13:43 +00:00
Kevin Hufnagle
fcd519fde9 docs: Use correct profile for intent
The ACTION_AUDIO_STATE_CHANGED intent action uses the HDP profile,
not the A2DP profile.

Bug: 158742305
Test: m ds-docs-java
Exempt-From-Owner-Approval: Docs-only change
Change-Id: I4358aac8c8aa9fc8b36e517e568e5a9db538555e
2020-10-19 21:08:17 -04:00
Roman Kalukiewicz
24403f7ef2 Add @Nullable annotation to the parameter of Object.equals() methods.
Those annotations could be inferred by some tools (like Kotlin), but the
https://checkerframework.org/ doesn't check inherited annotations
complaining about all equals() invocations that get nullable argument.

The change was generated by running

find . -name \*.java | xargs sed -i 's/public boolean equals(Object /public boolean equals(@Nullable Object /'

in the frameworks/base directory and by automatically adding and
formatting required imports if needed. No manual edits.

Bug: 170883422
Test: Annotation change only. Should have not impact.
Exempt-From-Owner-Approval: Mechanical change not specific to any component.
Change-Id: I5eedb571c9d78862115dfdc5dae1cf2a35343580
2020-10-15 10:48:01 -07:00
Jeff Sharkey
f76ffeaff1 Merge changes from topic "oct6"
* changes:
  Upgrade AndroidFrameworkBinderIdentity to fatal.
  Tighten up Binder.clearCallingIdentity() usage.
  Tighten up Binder.clearCallingIdentity() usage.
  Tighten up Binder.clearCallingIdentity() usage.
2020-10-08 18:50:22 +00:00
Jakub Pawlowski
0e2a4d0164 Merge "Bluetooth: make it possible to advertise service solicitation UUID" am: 60ccba0c52 am: 272efa5606 am: a32477e77e am: e4b95b5419
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453036

Change-Id: Ic32ac86ce3833b8fb5ecb02ad6fbd399160533c7
2020-10-08 12:03:00 +00:00
Jakub Pawlowski
e4b95b5419 Merge "Bluetooth: make it possible to advertise service solicitation UUID" am: 60ccba0c52 am: 272efa5606 am: a32477e77e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453036

Change-Id: I30f2113445c6bc72554351a4187166db8ff5e2c2
2020-10-08 11:48:51 +00:00
Jakub Pawlowski
9b46151ead Bluetooth: make it possible to advertise service solicitation UUID
Bug: 159827149
Tag: #feature
Test: called the API in test app, verified advertisement content
Change-Id: I3ab43e39bb7fd8fef97e141eeb981419aa3ec35a
2020-10-08 07:26:01 +00:00
Jeff Sharkey
b93712f623 Tighten up Binder.clearCallingIdentity() usage.
This is a third CL in a chain that adjusts existing malformed code
to follow AndroidFrameworkBinderIdentity best-practices.

Specifically, if a thread clears an identity they need to restore it
to avoid obscure security vulnerabilities.  In addition, the relevant
"try" block must start immediately after the identity is cleared to
ensure that its restored if/when any exceptions are thrown.

Bug: 155703208
Test: make
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: I74cb958b68d55a647547aae21baff6ddc364859b
2020-10-07 21:24:05 -06:00
Treehugger Robot
c861b286f1 Merge "Bluetooth: Spell mandatory correctly" am: e7899bcd32 am: e17c4e0003 am: 438264485d am: d55aea0c0d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449262

Change-Id: I78d8b4f3572d172cda209bfe98edd8f3e5f560b0
2020-10-05 21:38:30 +00:00
Treehugger Robot
d55aea0c0d Merge "Bluetooth: Spell mandatory correctly" am: e7899bcd32 am: e17c4e0003 am: 438264485d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449262

Change-Id: Ifeb448aa4ec158309cc8d86d05c13aeac9706b3f
2020-10-05 21:17:34 +00:00
Myles Watson
70b5ba179c Bluetooth: Spell mandatory correctly
Bug: 169654068
Test: compilation
Change-Id: Ibb0046180760e27d6991ae17849a7405738b6f01
2020-10-05 11:23:24 -07:00
Jakub Pawlowski
da0e253c5b Merge "Make BluetoothGattCallback.onServiceChanged public" am: 802503736d am: 531993dca1 am: 23c923d197 am: 41e6915dcd am: d69656a0b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1439193

Change-Id: If481ce4165216b93c0c78ed070c757e9fc632d91
2020-09-27 07:35:49 +00:00
Jakub Pawlowski
d69656a0b7 Merge "Make BluetoothGattCallback.onServiceChanged public" am: 802503736d am: 531993dca1 am: 23c923d197 am: 41e6915dcd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1439193

Change-Id: Id9945a11865c9e4ae0155eccc19cbbdc90dd5d48
2020-09-26 17:10:25 +00:00
Jakub Pawlowski
2c1d2c21cf Make BluetoothGattCallback.onServiceChanged public
Bug: 154056389
Test: proper CTS test will be provided
Change-Id: I2c9264910b65d62124c75c3ee3fd0b5bd18a2006
2020-09-26 15:50:37 +00:00
HsingYuan Lo
57c801d839 Merge "Expose service changed event to application (2/3)" am: 199d2c7384 am: 90fd6a303f am: b9fadf6916 am: 0e73bae3af am: b784e06bb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433925

Change-Id: I803a9b4ef0dcc5ce05b3803e01b558571de16cd8
2020-09-25 06:43:38 +00:00
HsingYuan Lo
b784e06bb0 Merge "Expose service changed event to application (2/3)" am: 199d2c7384 am: 90fd6a303f am: b9fadf6916 am: 0e73bae3af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433925

Change-Id: If6b1bd5ee1e3719c1f803ad06eb5e5fa931398df
2020-09-25 06:19:51 +00:00