aboutsummaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothDevice.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * Bluetooth: Modify and append to the Out-of-Band APIMartin Brabham2021-03-161-27/+23
| | | | | | | | | | | | | | | | | | | | | | | | - Modify createOutOfBand to be a SystemApi, and accept p192 and p256 data objects. - Modify OobData to become a SystemApi and to provide a Builder pattern for creation. CTS-Coverage-Bug: 182420103 Bug: 178007935 Test: compiles and runs Tag: #feature Change-Id: I46aec8c2cb64a8da8957d01d32b879d60df7a31c Merged-In: I46aec8c2cb64a8da8957d01d32b879d60df7a31c
* | Bluetooth: Modify and append to the Out-of-Band APIMartin Brabham2021-03-101-28/+24
| | | | | | | | | | | | | | | | | | | | | | - Modify createOutOfBand to be a SystemApi, and accept p192 and p256 data objects. - Modify OobData to become a SystemApi and to provide a Builder pattern for creation. CTS-Coverage-Bug: 182420103 Bug: 178007935 Test: compiles and runs Tag: #feature Change-Id: I46aec8c2cb64a8da8957d01d32b879d60df7a31c
* | Merge "Additional metadata keys for Fast Pair" am: 299f75a7a1 am: 92d3801173 ↵Treehugger Robot2021-03-031-2/+124
|\| | | | | | | | | | | | | | | | | | | am: 6553e5df94 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596412 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia447b1cd574a51477d1dd383dbeaa694ace7ffb9
| * Additional metadata keys for Fast PairUgo Yu2021-03-021-2/+124
| | | | | | | | | | | | | | Tag: #feature Bug: 171387275 Test: atest BluetoothInstrumentationTests Change-Id: I98f4cbd214437d1cd3681be03108c824ad087260
| * Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-11-041-12/+13
| | | | | | | | | | | | | | | | | | | | | | 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
* | Skips the consent pairing dialog for recently associated CDM app and device ↵Rahul Sabnis2021-02-101-1/+27
| | | | | | | | | | | | | | | | | | combos because they have already been shown the CDM prompt which implicitly provides consent to bond. Tag: #feature Bug: 172006481 Test: Manual Change-Id: I541b720c6b8b6e55be10e04f202e0a58cf33715f
* | Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-10-291-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Revert "Add maxTargetSdk restriction to unused APIs."Hongwei Wang2020-10-281-13/+12
| | | | | | | | | | | | | | | | | | This reverts commit bc9a809f18a3b0ec23cbc39802fb4928c2074ea3. 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
* | Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-10-271-12/+13
| | | | | | | | | | | | | | | | | | | | 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
* | Add @Nullable annotation to the parameter of Object.equals() methods.Roman Kalukiewicz2020-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge changes from topic "sep11" am: c0b288133a am: 58d54530bb am: ↵Jeff Sharkey2020-09-151-6/+6
|\| | | | | | | | | | | | | | | 7d4e7a0e02 am: f92319747e am: a31ee4c4a0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195 Change-Id: Id01f468b43fd5b2aada78608010625b392c1b647
| * Update language to comply with Android's inclusive language guidanceJeff Sharkey2020-09-141-6/+6
| | | | | | | | | | | | | | | | | | See https://source.android.com/setup/contribute/respectful-code for reference Test: none Bug: 168334533 Exempt-From-Owner-Approval: docs updates Change-Id: I245b8d9cac722da76ea67983738a3cbb9deb68df
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-311-21/+33
| |\ | | | | | | | | | | | | | | | Bug: 166295507 Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27 Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
* | \ Merge "Do not log sensitive information in AudioService."TreeHugger Robot2020-08-011-0/+12
|\ \ \
| * | | Do not log sensitive information in AudioService.jiabin2020-07-311-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sensitive information, such as IP and MAC address, should not be logged. In AudioService, only log the last 3 octets of BT device address. Test: make, connect BT device and log Bug: 162299985 Change-Id: I99db812efc327e6f3ebe791274998291a140a5b6
* | | | Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot2020-07-291-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | am: cc2d51fcef am: e493ee5f74 am: d7209e36ba am: b837ae60d5 am: 8ba9b0f3a2 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374017 Change-Id: Ife7a9e5dbd75d0bbe6d40ee257e50ea998df4822
| * | | Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot2020-07-291-2/+2
| |\| | | | |/ | |/| | | | | | | | | | | | | | | | am: cc2d51fcef am: e493ee5f74 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374017 Change-Id: Ib2aa56b08e4cf507a5c878295114091ce600eae0
| | * Update language to comply with Android's inclusive language guidanceAlice Kuo2020-07-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://source.android.com/setup/contribute/respectful-code for reference #inclusivefixit Bug: 161896447 Test: NA (Comment only) Change-Id: Id4f72f98d5a5def26d42d112aeb1b67217d38af0
| | * Add BLUETOOTH_PRIVILEGED permission as a requirement for all new Bluetooth ↵Rahul Sabnis2020-03-211-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SystemApis and for hidden connect/disconnect APIs. Hide some APIs that were previously marked as @UnsupportedAppUsage and re-add annotation as changing the permissions for these SystemApis would break the unsupported app contract that was previously there. Therefore, we're choosing to hide them until we have a good story on how to deal with them next release. Bug: 148689314 Test: Manual Merged-In: I33ee2c7ccd3827db3d23d6447cf82d9ffc36836a Change-Id: I33ee2c7ccd3827db3d23d6447cf82d9ffc36836a
* | | Bluetooth: Add pairing initiator extraMyles Watson2020-06-131-0/+20
|/ / | | | | | | | | | | | | | | Remember if the pairing app was in the foreground. Bug: 150156492 Test: pair two devices, unpair on one device, try to reconnect Change-Id: I6f564857974146e0c18134648eb1e297e8afbc6f
* | Merge "Add BLUETOOTH_PRIVILEGED permission as a requirement for all new ↵Rahul Sabnis2020-03-211-17/+15
|\ \ | | | | | | | | | | | | | | | Bluetooth SystemApis and for hidden connect/disconnect APIs." into rvc-dev am: bd91b5360f Change-Id: I342a5b035d9ded41e1a850553148c7b184f8a46c
| * | Add BLUETOOTH_PRIVILEGED permission as a requirement for all new Bluetooth ↵Rahul Sabnis2020-03-211-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SystemApis and for hidden connect/disconnect APIs. Hide some APIs that were previously marked as @UnsupportedAppUsage and re-add annotation as changing the permissions for these SystemApis would break the unsupported app contract that was previously there. Therefore, we're choosing to hide them until we have a good story on how to deal with them next release. Bug: 148689314 Test: Manual Change-Id: I33ee2c7ccd3827db3d23d6447cf82d9ffc36836a
| * | Add error code for BluetoothDevice#getBatteryLevel to representRahul Sabnis2020-03-201-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bluetooth is off Bug: 147428695 Test: Manual Merged-In: I07c2fa49954632da6aa6a93706883e4cdfd32fa6 Change-Id: I07c2fa49954632da6aa6a93706883e4cdfd32fa6
* | | Merge "Add error code for BluetoothDevice#getBatteryLevel to represent ↵Automerger Merge Worker2020-03-101-7/+17
|\ \ \ | | |/ | |/| | | | | | | | | | Bluetooth is off" am: 7747345d01 am: 4e85f7bb92 Change-Id: Id96fc34f2d766829d18ee79c7f260b43ef95f434
| * | Merge "Add error code for BluetoothDevice#getBatteryLevel to represent ↵Treehugger Robot2020-03-101-7/+17
| |\ \ | | | | | | | | | | | | Bluetooth is off"
| | * | Add error code for BluetoothDevice#getBatteryLevel to representRahul Sabnis2020-03-061-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bluetooth is off Bug: 147428695 Test: Manual Change-Id: I07c2fa49954632da6aa6a93706883e4cdfd32fa6
| * | | Merge "Update BluetoothDevice SystemApi permissions and disallow passing a ↵Automerger Merge Worker2020-03-041-17/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | null pin to BluetoothDevice#setPin" am: 5f1daae19f Change-Id: I4204ee9c10101d99fc8e4bad4ee44fc431f2cb9f
| | * | | Update BluetoothDevice SystemApi permissions and disallow passing a nullRahul Sabnis2020-03-031-17/+13
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pin to BluetoothDevice#setPin Bug: 147428695 Test: Manual Merged-In: I74613d61420babecf5f1976fe33a2e1a729b71a1 Change-Id: I74613d61420babecf5f1976fe33a2e1a729b71a1
* | | | Merge "Update BluetoothDevice SystemApi permissions and disallow passing a ↵Automerger Merge Worker2020-03-031-17/+13
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | null pin to BluetoothDevice#setPin" into rvc-dev am: f99bff4210 Change-Id: Ia6ca3eee69bf89161824cf6b428363e48b9a8e3e
| * | | Update BluetoothDevice SystemApi permissions and disallow passing a nullRahul Sabnis2020-03-021-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pin to BluetoothDevice#setPin Bug: 147428695 Test: Manual Change-Id: I74613d61420babecf5f1976fe33a2e1a729b71a1
* | | | Merge "Sanitize Bluetooth device names without regex" am: d012f6a977 am: ↵Automerger Merge Worker2020-03-011-1/+5
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | 635954a770 Change-Id: I044fa2a33359b90724e68f89b1762e0e2b3b196a
| * | Merge "Sanitize Bluetooth device names without regex" am: d012f6a977Automerger Merge Worker2020-03-011-1/+5
| |\| | | | | | | | | | Change-Id: I97c50cc31e681e53cc74d76803e3e24566b7e5dd
| | * Sanitize Bluetooth device names without regexDan Sandler2020-02-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Saves a considerable amount of RAM. Fixes: 145623858 Test: Pair with a simulated device with whitespace in the name Change-Id: I1c8b00922534ee5941be6b14948c0941c5640862
* | | Binder cache for Bluetooth getBondState()Lee Shombert2020-02-191-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 140788621 Test: A special build that puts the PropertyInvalidatedCache in verification mode was loaded on the device. Then one iteration of MPTS was executed. No cache inconsistencies were found and no SELinux violations (associated with the binder cache) were found. The number of cache misses was approximately 10% of the total binder calls. Then the phone was cycled through bluetooth pairing and unpairing events. Change-Id: Ia494f0ad58b889130052e5beb3bec6d1011508ef
* | | Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am: ↵Automerger Merge Worker2020-02-021-1/+1
|\| | | | | | | | | | | | | | | | | ecda1316e9 am: 80df4cc05e am: bf18027900 Change-Id: I61d78666262095cd22f3fdef7bcc50e281ddc2a0
| * | Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am: ↵Automerger Merge Worker2020-02-011-1/+1
| |\| | | | | | | | | | | | | | | | ecda1316e9 Change-Id: I363ded95542c1402b6828d5475e04d2554c8d01e
| | * Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias"Treehugger Robot2020-02-011-1/+1
| | |\
| | | * Add privileged permission to SystemApi BluetoothDevice#setAliasRahul Sabnis2020-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 144792904 Test: Manual Change-Id: Ie11109736bb0eb4cd0f06c38db44805c0169ac5f
* | | | Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to ↵Automerger Merge Worker2020-02-011-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" am: 2d616e0882 am: ea358dd7fa am: e034978011 Change-Id: I3e6e9f7dd0ae3472bc97e3b28fdb6af48cb8e091
| * | | Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to ↵Automerger Merge Worker2020-02-011-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" am: 2d616e0882 Change-Id: Ib585b2b8831e12ba8231704a99a47ceaf0da0e8e
| | * | Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back toRahul Sabnis2020-01-311-1/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED Bug: 146158681 Test: Manual Change-Id: Ie247568ff3e5a750d74f22636aca69e3e74a55f5
* | | Merge "Bluetooth LE COC: Delete unused testing API" am: 25983a0972 am: ↵Automerger Merge Worker2020-01-251-22/+0
|\| | | | | | | | | | | | | | | | | a55000a6ab am: 2db15b953a Change-Id: I336a04270cbce29fb8998474f28d0dea8eadd9d2
| * | Merge "Bluetooth LE COC: Delete unused testing API"Hansong Zhang2020-01-241-22/+0
| |\| | | | | | | | | | | | | | | | am: 25983a0972 Change-Id: Iba4797930d442399b4078705b30eef07855dabee
| | * Bluetooth LE COC: Delete unused testing APIHansong Zhang2020-01-241-22/+0
| | | | | | | | | | | | | | | | | | | | | Some methods are for SL4A test only, and now they have been migrated. Test: compile Change-Id: I86e22814fc9a3fd296c359804a465b9ead4d926f
| | * Use new UnsupportedAppUsage annotation.Artur Satayev2020-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: I6ab53570aca580fbee1fcc927871caa09780f58f Merged-In: I6ab53570aca580fbee1fcc927871caa09780f58f
| * | Use new UnsupportedAppUsage annotation.Artur Satayev2020-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: I6ab53570aca580fbee1fcc927871caa09780f58f Merged-In: I6ab53570aca580fbee1fcc927871caa09780f58f
* | | Use new UnsupportedAppUsage annotation.Artur Satayev2019-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: I6ab53570aca580fbee1fcc927871caa09780f58f
* | | Merge "Resolve BluetoothDevice hidden API usages by Settings" am: ce656f7754 ↵Automerger Merge Worker2019-12-121-57/+70
|\| | | | | | | | | | | | | | | | | am: 10b567fe12 am: a6e9936b78 Change-Id: Ic45b11120553e256ccc774307a108b94aafbabcc
| * | Merge "Resolve BluetoothDevice hidden API usages by Settings" am: ce656f7754 ↵Automerger Merge Worker2019-12-121-57/+70
| |\| | | | | | | | | | | | | | | | am: 10b567fe12 Change-Id: I001128eba5499a0a080707d00c1627335eae7514
| | * Resolve BluetoothDevice hidden API usages by SettingsRahul Sabnis2019-12-111-57/+70
| | | | | | | | | | | | | | | | | | Bug: 143245666 Test: Manual Change-Id: Id34eb275f604e61330aeb91401dc31aeca666b8f