summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004cm-13.0Michael Bestas2019-08-10132-3469/+794
| | | | Change-Id: Ic183fd02d756f337328169f995e6cee24b700e35
* Make sure server response doesn't exceed maximum allowable lengthreplicant-6.0-0004-rc1Jakub Pawlowski2018-07-161-1/+7
| | | | | | | | | Bug: 78787521 Test: try sending response bigger than BTGATT_MAX_ATTR_LEN Change-Id: I51b12483cced7e4c0d967acf5bb42559ef169fe7 Merged-In: I51b12483cced7e4c0d967acf5bb42559ef169fe7 (cherry picked from commit 0f34ae9398ed017465c0cac7387be9e6951c07be) (cherry picked from commit c2813a2b6e6dda20e9a25947a4cf5adf6a4f4132)
* Bluetooth: fix aapt warnings on "has no default translation"Andreas Blaesius2018-05-1358-870/+0
| | | | Change-Id: I9166022f9edb2a44a67381d15f1c53f3f7469fce
* Automatic translation importAbhisek Devkota2017-12-1312-0/+417
| | | | Change-Id: I2ba2b16a47c8aa381fcc4b24661cc789ac5629e4
* Automatic translation importreplicant-6.0-0003Abhisek Devkota2017-09-194-23/+9
| | | | Change-Id: Iea8cea446d5c1ce97a80b66d05564f94739535a7
* Automatic translation importreplicant-6.0-0002Abhisek Devkota2017-07-272-3/+3
| | | | Change-Id: Ia6afba7fc0da1aaec68e2ddfb1cd35672ab0442c
* Automatic translation importAbhisek Devkota2017-06-221-1/+1
| | | | Change-Id: I53912845bc113217bc4508dc036a0f111c067254
* Prevent OPP from opening files that aren't sent over BluetoothAjay Panicker2017-06-091-10/+10
| | | | | | | | | | | | | | | | | Before this patch an app could send an open intent to BluetoothOppTransferService using a fake content provider to gain external read and write access. We fix this by checking the Uri of the file before opening it to see if it originated from the Bluetooth Share content provider. We also stop graning write access to apps that we use to view the file. Bug: 35385327 Test: PoC found in bug AOSP-Change-Id: Iad85490a0306b3e70767285393b204be22b11511 (cherry picked from commit f20350af42cd5cce1a762ef587ee50fef696f0f0) CVE-2017-0645 Change-Id: Ifab44ac73191fb8d9d9265390541ed32118f49df
* [BACKPORT] OPP: Restrict file based URI access to external storageJack He2017-06-096-14/+70
| | | | | | | | | | | | | | | | | * Allow only external storage paths in file based URI in BluetoothOppSendFileInfo when the file send request comes from an external source * Fix a potential NPE when using Uri.getPath() Bug: 35310991 Test: Make, test various cases of Bluetooth file share AOSP-Change-Id: I8ff00d63d3c880667302f8d7ff8eaa0c0b533921 (cherry picked from commit 3edd7f0a8aadf2f44bc62ea5b567c74d39a534c8) (cherry picked from commit 3ce229fa602f739d1e98e2a85a3bd955c3a308f6) CVE-2017-0639 Change-Id: I8e90c92ae7be6819528e35638bf033f4826af16d
* Automatic translation importAbhisek Devkota2017-06-032-0/+4
| | | | Change-Id: I569871710fadfd20c0fb5c98b07faf105ce0a985
* Automatic translation importreplicant-6.0-0001Abhisek Devkota2017-04-287-109/+12
| | | | Change-Id: Iabc34a68e27362743772c0dfd33a3d7a0ee50665
* Remove MANAGE_DOCUMENTS permission as it isn't neededAjay Panicker2017-03-131-1/+0
| | | | | | | | Fix Merge Conflict in nyc-mr1-security-c-release Bug: 32612586 Change-Id: Iebe7dc9b198ce99d5921f5a349ba9d5d4424d156 (cherry picked from commit 22d032fc493070d3c4b2efffa6aa592e20cf8578) (cherry picked from commit cbced755b72357affca9e785be8384263334833c)
* Automatic translation importAbhisek Devkota2017-02-195-0/+142
| | | | Change-Id: Icb0edcbba811584fa1eb035f0011872593506c74
* Automatic translation importAbhisek Devkota2017-02-012-2/+2
| | | | Change-Id: I3f86e94991d32481550f96ba97be53a1244ffff9
* Automatic translation importAbhisek Devkota2017-01-2618-144/+0
| | | | Change-Id: I1e2eff1f5993751713dab528876486e819841bbf
* Automatic translation importblinky@build012016-12-2235-0/+195
| | | | | Change-Id: Id3f976ddba28622e60ad783af0d8ab1fb6c53b5d Ticket: -
* Automatic translation importblinky@build012016-12-211-1/+1
| | | | | Change-Id: Ica09c45ad097be8cf0e21fd3c89e2949f3bd29ce Ticket: -
* Automatic translation importclyde@build012016-12-161-0/+2
| | | | | Change-Id: If91ca8e303a2040a1da2dbda0f9a376379c715d7 Ticket: -
* Automatic translation importinky@build012016-11-291-1/+0
| | | | | Change-Id: If8c7d5099841b40248f5a9e3922865d824dc5abe Ticket: -
* Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-091-2/+2
|\ | | | | | | | | | | | | | | CYNGNOS-3303 Android 6.0.1 release 74 Change-Id: I0300b0fe91395d76ab3da579bc442e15d6ca0094
| * Fix setPairingConfirmation permissions issue (1/2)Ajay Panicker2016-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | setPairingConfirmation was set to only require BLUETOOTH_ADMIN permission which shouldn't be able to set the confirmation itself. This is restricted to BLUETOOTH_PRIVILEGED permission. Bug: 29043989 Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa (cherry picked from commit df3304a333d8c385f9d5cb0e691fb72d940ec273)
* | Automatic translation importpinky@build012016-09-251-0/+12
| | | | | | | | | | Change-Id: Ib1eafd65990003451550fcd5c93a36afc084fd60 Ticket: -
* | Automatic translation importpinky@build012016-08-290-0/+0
| | | | | | | | | | Change-Id: Id93dbff4edaaee2b23436463ead8b007ebef4f0c Ticket: -
* | Automatic translation importpinky@build012016-08-2710-0/+410
| | | | | | | | | | Change-Id: Icaf91b74e5372659c4894ad77926b7eb61324070 Ticket: -
* | bluetooth: Broadcast battery statusGavin Ni2016-08-041-0/+2
| | | | | | | | Change-Id: Ie2f10ee3e4276d05c8218af413ffb13b6b76c7c7
* | Add epub to the list of filetypes to get and sendMarcos Marado2016-07-282-0/+2
| | | | | | | | | | | | | | Since we do allow to send and receive PDF files via bluetooth, I don't see a reason why can't we do exactly the same for epub files. Change-Id: I10b7182ce1b6c36b693065de1e8bc61a90912d98
* | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-073-6/+7
|\| | | | | | | | | | | Ticket: CYNGNOS-3020 Change-Id: Icb958f1b291af724f6ea2fc43b53321df67f3212
| * Add guest mode functionality (3/3)Ajay Panicker2016-05-273-6/+7
| | | | | | | | | | | | | | | | | | | | | | Add a flag to enable() to start Bluetooth in restricted mode. In restricted mode, all devices that are paired during restricted mode are deleted upon leaving restricted mode. Right now restricted mode is only entered while a guest user is active. Bug: 27410683 Change-Id: If4a8855faf362d7f6de509d7ddc7197d1ac75cee
* | Revert "Revert "Ensure synchronized access of JNI callback object""Roman Birg2016-06-251-28/+53
| | | | | | | | | | | | | | | | This is a valid fix and we shouldn't need to revert it. This reverts commit 9792f9638a9d3f7dc84cb80182fa188d639d4ae5. Change-Id: I4c41ec98addcfc1630f054e01024bfecf12c1754
* | Automatic translation importinky@build012016-06-173-1/+25
| | | | | | | | Change-Id: I174bcc362d1f13ed666565451eff949ba570f74b
* | Bluetooth-OPP: Check URI of sending files before entry cleanupJuffin Alex Varghese2016-06-101-4/+3
| | | | | | | | | | | | | | | | | | Checking the URI of sending files before removing the file entry from Hashmap. Otherwise, during BT ON/OFF scenario there is a possibility of URI becoming NULL that will lead to BT app crash. CRs-Fixed: 721360 Change-Id: Ic7e8966d38e30948228e14a740cd3051b345da31
* | Set sJniAdapterServiceObj to NULL after deleting itLuke Zhang2016-06-101-1/+4
| | | | | | | | | | | | | | | | | | In cleanupNative function, we delete the global reference object sJniAdapterServiceObj, but we does not set it to NULL. As a result, it crashed later when we access this object again. Change-Id: I394b8741108a9192adac91fc4b16412bb64eaf64 CR-fixed: 961141
* | Bluetooth: Using the eventHandler to start listenerAjay Kumar2016-06-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | if the intent is delayed we are directly calling the listener which is not dynamically checking the current state of adapter.This might create issue if we recieve this intent when BT is not in ON State.Eventhandler is already having this check so using eventhandler instead of direct call. Crs-Fixed: 956092 Change-Id: Ie5331a180f1d74e5843d5b25ded69466e0b59635
* | Bluetooth OPP: Fix mismergeRoman Birg2016-06-101-39/+20
| | | | | | | | | | | | | | These changes are present in "BT: Fix following issues in data profiles" with commit id 49c3eb7394d46b51556fad6e31b21f90c0d54675 Change-Id: I2932939a71fc38d1e4f070c158af7cde664db07d
* | Bluetooth: fix opp NPERoman Birg2016-06-102-2/+2
| | | | | | | | | | | | | | Ticket: CYNGNOS-2866 Change-Id: I7ffd329564713adf25b2033291a21546321df5df Signed-off-by: Roman Birg <roman@cyngn.com>
* | Revert "Ensure synchronized access of JNI callback object"Roman Birg2016-06-091-53/+28
| | | | | | | | | | | | | | | | | | | | This was supposed to fix screen-on buffer underruns with angler, but it did not solve the issueso I'd rather revert this now than it causing issues down the line. This reverts commit 2c9c5455f29312e4180181a72e145dd9e656e7c6. Change-Id: I2bc62df648f75cc6ba8e64db04cdc378ecc6f23d
* | Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-071-2/+10
|\| | | | | | | | | | | Android 6.0.1 release 46 Change-Id: I75237fcf04ee9c926c74651268d71c1cb211ec32
| * "DO NOT MERGE" Add write SMS protectionSeven Shen2016-04-211-2/+10
| | | | | | | | | | Bug: 25138326 Change-Id: I9f418370b8725d49e3734406b6f435107bcff021
* | Automatic translation importJessica Wagantall2016-05-261-1/+1
| | | | | | | | | | Change-Id: I7ae65038404af90b8c93abbb2eb90d41c7e28ac0 Ticket: RM-214
* | Fix NL translation after r22 revertMichael Bestas2016-05-221-1/+1
| | | | | | | | Change-Id: I45bac95d4b6ad4f637e5fb96fac46c3ada5c3773
* | Bluetooth: handle opening incoming APK filesRoman Birg2016-05-191-1/+8
| | | | | | | | | | | | | | Ticket: FEIJ-493 Change-Id: I991146482ae69acf02ada93aa6c71441e67927d7 Signed-off-by: Roman Birg <roman@cyngn.com>
* | Automatic translation importAbhisek Devkota2016-05-171-0/+2
| | | | | | | | Change-Id: I8bdc6dd49571e23e1797466ce76f15a6d0eab626
* | Automatic translation importMichael Bestas2016-05-101-0/+2
| | | | | | | | Change-Id: Iab9f09f988de5b54b1145365268cb0de01526d79
* | Partially revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-0186-315/+918
| | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Bluetooth into cm-13.0" This reverts commit c2731fa898ec36edc24eb6316f7521896fdd59c2, reversing changes made to 14a2811d71fd98cd628e6e19bba2768e38934d99. Change-Id: Ib503192648ac768ee69adca4c5f5b1435dbe60d7
* | Ensure synchronized access of JNI callback objectAyan Ghosh2016-04-251-28/+53
| | | | | | | | | | | | | | | | | | | | | | Ensure synchronized access of JNI object using mutex as the same is accessed from both Application context during cleanup and from stack call back context during intimating Apps on stack event update. CRs-Fixed: 959400 Change-Id: I39f97f1b530086bc446941dde744e43c33b46f81
* | Merge tag 'android-6.0.1_r30' into rebase_r30Jessica Wagantall2016-04-200-0/+0
|\| | | | | | | | | | | | | RM-234 Android 6.0.1 release 30 Change-Id: Ie6d2bfeb30a339aadb72c729ddbbff96511a3c40
| * DO NOT MERGE Enhance AVRCP Absolute Volume control implementationLiejun Tao2016-02-244-33/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remember the current local volume level, current remote volume level. When user adjusts the volume, compare the returned remote volume level with desired volume level, if they don't match, do retry. 2.Learn and remember the volume mapping between phone volume level and remote volume level as the user adjusts volume. When user adjusts to one remembered volume level, use the mapping directly. Otherwise calculate the remote volume level and try with method described in step one. 3. Blacklist device if remote device does not tell its initial volume. 4. Define optional threshold for initial volume level to avoid headset being too loud upon re-connection. Signed-off-by: Liejun Tao <baibai@motorola.com> Change-Id: I78112f5f401666f5a680561473a5c7f914071fbe
* | Merge commit 'a71eb120c7390a82474bf8bdb94d08e723582f9f' into HEADJessica Wagantall2016-04-193-5/+86
|\| | | | | | | | | | | RM-234 Change-Id: I00b6d4819298fe53dcda3de0f41ed40ca1a86d0b
| * DO NOT MERGE Read Bluetooth interop database entries from settings (2/2)Andre Eisenbach2016-02-242-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Interop database entries are stored in the system settings entry "BluetoothInteropDatabase". The format is a list of entries separated by ";". An entry consists of a BDA fragment, followed by a comma and an integer representing a feature from interop.h. Example: To disable LE secure connections for devices starting with BDA 11:22:33, use "11:22:33,0". Bug: 26548845 Change-Id: I5903930178b70d1eb52d64b1c6051ce8ee346da4
| * Fix memory leak in Bluetooth AVRCP JNICasper Bonde2016-02-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | When rebasing change-id I3941793f9843abf4afa5ffbee40d1d01c118b29b later change bbb4110b455b3aa29106d5b4f0a37e1be8e09475 in AOSP, a memory leak fix was removed by accident. This patch re-enables the memory leak fix. Bug: 26383160 Change-Id: I70fd2ea00f6135803f92aad3adda9ce38f47cc32 Signed-off-by: Casper Bonde <c.bonde@samsung.com> (cherry picked from commit 3a4b8693ee49932247a96099942fa1cecb4670bc)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 16:32:36 +0000