summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix setPairingConfirmation permissions issue (1/2)stable/cm-13.0-ZNH5YAjay Panicker2016-12-031-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. RM-290 Bug: 29043989 Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa (cherry picked from commit df3304a333d8c385f9d5cb0e691fb72d940ec273)
* Automatic translation importpinky@build012016-08-213-0/+136
| | | | | Change-Id: I0a430989d6e2bcd7fa5bee2fb0aaaa59f0f1e04b Ticket: RM-290
* Automatic translation importpinky@build012016-08-190-0/+0
| | | | | Change-Id: Iecc9419e8671fbaebdf837f688723e60c365535a Ticket: RM-290
* Automatic translation importpinky@build012016-08-193-0/+136
| | | | | Change-Id: Ib748d7a46b6c9f88fff4b0a416344ed86951713a Ticket: RM-290
* Automatic translation importclyde@build012016-08-161-0/+2
| | | | | Change-Id: Iaa18f45724692b04109fc7afc39d9a39ed792fa3 Ticket: RM-290
* bluetooth: Broadcast battery statusGavin Ni2016-08-141-0/+2
| | | | | | RM-290 Change-Id: Ie2f10ee3e4276d05c8218af413ffb13b6b76c7c7 (cherry picked from commit 21320841880408213e9797960c1378df16472d7a)
* Automatic translation importblinky@build012016-08-133-0/+136
| | | | | Change-Id: I22a266fa5e3eb60fc74cb9c4dc1c7be99162e4b7 Ticket: RM-290
* Automatic translation importclyde@build012016-08-080-0/+0
| | | | | Change-Id: I62bf0c1aa3cbb78b102689c24f2dac07e72decb8 Ticket: RM-290
* Automatic translation importinky@build012016-08-080-0/+0
| | | | | Change-Id: I35529f6196a9b090ac094b938c79f107d98db0c8 Ticket: RM-290
* Automatic translation importinky@build012016-08-071-1/+1
| | | | | Change-Id: I0ff4c495b4d64607aeeaac3ea37d948ac8fc5bbf Ticket: RM-290
* 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)
| * [DO NOT MERGE ANYWHERE] Null terminate MAP instance informationAjay Panicker2016-02-161-3/+4
| | | | | | | | | | Bug: 26437927 Change-Id: I673de7f7c68b9a02b234bb99c6f89c7fc36f90c9
* | Automatic translation importMichael Bestas2016-04-165-1/+139
| | | | | | | | Change-Id: I697f981458b148e53cd62a902f7c2dab1f293963
* | hdp: do not return a null value when hdp interface unavailableArnav Gupta2016-04-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | We're not supposed to return a NULL from a int return function. And indeed the calling Java code does not have a NPE check either. If an HDP interface is not avaialable, send -1 which the Java code correctly assumes as a failure to register the health app. Change-Id: I5ac7dc6f9acc9fefae8d1d2233453448c3ba79bc Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
* | Merge branch 'LA.BF.1.1.3_rb1.12' of ↵Steve Kondik2016-04-0819-187/+260
|\ \ | | | | | | | | | | | | | | | git://codeaurora.org/platform/packages/apps/Bluetooth into cm-13.0 Change-Id: I30c9851dac3d9c66aebf7a1fcd81258c9ee5c1b5
| * \ Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.012 on remote branchLinux Build Service Account2016-04-030-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I193d47ce801d97a9eef6cba62fb0149542bc5485
| * \ \ Merge "Fix a logical error in isAbsoluteVolumeSupported."Linux Build Service Account2016-03-301-1/+1
| |\ \ \
| | * | | Fix a logical error in isAbsoluteVolumeSupported.kexiao2016-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no device connected, regard it as not support AbsoluteVolume. CRs-fixed: 987941 Change-Id: Ied416d7f59953ab89ad5a2c25605909d86f542f2
| * | | | Merge "Revert "Multiuser: Check if valid user before starting service""Linux Build Service Account2016-03-264-20/+0
| |\ \ \ \
| | * | | | Revert "Multiuser: Check if valid user before starting service"Sravan Kumar V2016-03-214-20/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cd271a3ad8a47bb561292324cf46245bab0435a8 which were preventing services from gettign started. Checks are not required now as handling for socket listening is now added in AdapterService code. Change-Id: I3b819b3fe665951c3d7e0bca13a4da6287c8890e CRs-Fixed: 992642
| * | | | Merge "Revert "Bluetooth-OPP: Start outbound transfer only after OPPService ↵Linux Build Service Account2016-03-263-33/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | is up""
| | * | | | Revert "Bluetooth-OPP: Start outbound transfer only after OPPService is up"Sravan Kumar V2016-03-213-33/+17
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 065ba3bac2161507d530eb4b8b39147893a22d3a. Change-Id: I5f0b9c786bdf93c22c189bced7f61c7522a63e3f CRs-Fixed: 992642
| * | | | Merge "OPP: Add checks to initiate rfcomm connection in case sdp fails"Linux Build Service Account2016-03-261-9/+53
| |\ \ \ \
| | * | | | OPP: Add checks to initiate rfcomm connection in case sdp failsHemant Gupta2016-03-211-9/+53
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch initiates rfcomm connection directly when sdp fails to start for Obex over l2cap. This would prevent usecases when in CTS test multiple user are creted, and sdp is initiated by profile user which is different from active user, resulting in unecessary wait for 10 seconds for SDP, leading to test case failure. Change-Id: I2d307b48a9a835e3cec17dc5ca66ddda9c13446e CRs-Fixed: 992642
| * | | | Merge "Bluetooth-OPP: Use a volatile variable to denote interrupt status"Linux Build Service Account2016-03-262-3/+28
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Bluetooth-OPP: Use a volatile variable to denote interrupt statuszhenchao2016-03-042-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes, isInterrupted() can not return true and no interruptedException throw after uiUpdateThread.interrupt(), which cause the dead loop in ContentResolverUpdateThread. So a volatie variable is used instead of isInterrupted() to denote interrupt status. CRs-Fixed: 979690 Change-Id: I45ec1c20b5a381ba75aca589c28a0ddd94573d0c
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 19:36:04 +0000