summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix setPairingConfirmation permissions issue (1/2)stable/cm-13.0-ZNH2KAjay Panicker2016-11-101-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. CYNGNOS-3303 Bug: 29043989 Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa (cherry picked from commit df3304a333d8c385f9d5cb0e691fb72d940ec273)
* Automatic translation importinky@build012016-10-021-1/+0
| | | | | Change-Id: I4c7efb4edb0fc1ece14177257cced025f997f649 Ticket: RM-231
* Automatic translation importblinky@build012016-09-181-0/+12
| | | | | Change-Id: I45affd8998f8bd0d668337582e14944f89999b30 Ticket: RM-231
* Automatic translation importpinky@build012016-08-230-0/+0
| | | | | Change-Id: Id3057e683835531a60be8efe9e62edf109c5cf86 Ticket: RM-231
* Automatic translation importclyde@build012016-08-233-0/+136
| | | | | Change-Id: I7de2feae73d104860e4ea5757191373bb7c669dd Ticket: RM-231
* Automatic translation importclyde@build012016-08-183-0/+136
| | | | | Change-Id: I85feb6b308da58602e840446e722e31199e3607d Ticket: RM-231
* Automatic translation importblinky@build012016-08-161-0/+2
| | | | | Change-Id: Ia3782dcdc31c74f0c72eab3ab5f1dd41ff456b66 Ticket: RM-231
* Automatic translation importpinky@build012016-08-133-0/+136
| | | | | Change-Id: I7c07b3696a9e4a486d7e0f4a1f73a55a41461924 Ticket: RM-231
* Add guest mode functionality (3/3)Ajay Panicker2016-07-073-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. Ticket: CYNGNOS-3020 Bug: 27410683 Change-Id: If4a8855faf362d7f6de509d7ddc7197d1ac75cee (cherry picked from commit af5b1764daa3b212d471f000d7091ac07c040453)
* Bluetooth OPP: Fix mismergeRoman Birg2016-06-231-39/+20
| | | | | | | | | These changes are present in "BT: Fix following issues in data profiles" with commit id 49c3eb7394d46b51556fad6e31b21f90c0d54675 CYNGNOS-2866 Change-Id: I2932939a71fc38d1e4f070c158af7cde664db07d (cherry picked from commit 5080b9b7293800b9f2be6887096f1eb54e1c55fc)
* Automatic translation importinky@build012016-06-173-1/+25
| | | | | Change-Id: If44ccf9635bd1862e19a99fa9fda921044a9e846 Ticket: RM-231
* Set sJniAdapterServiceObj to NULL after deleting itLuke Zhang2016-06-151-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. CYNGNOS-2866 Change-Id: I394b8741108a9192adac91fc4b16412bb64eaf64 CR-fixed: 961141 (cherry picked from commit cf5fdf71346d780e998c0fd1f8335517528695db)
* Bluetooth: Using the eventHandler to start listenerAjay Kumar2016-06-151-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. CYNGNOS-2866 Crs-Fixed: 956092 Change-Id: Ie5331a180f1d74e5843d5b25ded69466e0b59635 (cherry picked from commit 02d9c106fe98757768eb8c8d11f3afbda52a6c9d)
* Bluetooth: fix opp NPERoman Birg2016-06-132-2/+2
| | | | | | | | Ticket: CYNGNOS-2866 Change-Id: I7ffd329564713adf25b2033291a21546321df5df Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit 072643fb5918d4f096d7534abf8022001b7519a3)
* [PATCH] "DO NOT MERGE" Add write SMS protectionSeven Shen2016-06-071-2/+10
| | | | | | | Ticket: CYNGNOS-2707 Bug: 25138326 Change-Id: I9f418370b8725d49e3734406b6f435107bcff021 (cherry picked from commit 64745b114948ea0c774f74af5721b6283087247d)
* Automatic translation importJessica Wagantall2016-05-261-1/+1
| | | | | Change-Id: Ib275173b55821acd80e7e50314bcb022cecfe0e7 Ticket: RM-214
* Fix NL translation after r22 revertMichael Bestas2016-05-231-1/+1
| | | | | | | RM-232 Change-Id: I45bac95d4b6ad4f637e5fb96fac46c3ada5c3773 (cherry picked from commit 2a2435225394c42c4273a1b81c402c24fbfdcca4)
* 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> (cherry picked from commit 4e3379cb9a0cc200710a7a87fe4d1e589738365c)
* Automatic translation importAbhisek Devkota2016-05-171-0/+2
| | | | | Change-Id: I075ae4a7d7eba848fc29a9c7dd0d8518904d92cd Ticket: RM-231
* Merge remote-tracking branch 'github/cm-13.0' into HEADJessica Wagantall2016-05-1624-221/+403
|\ | | | | | | | | | | OPO-618 Change-Id: I11479a6ae1f1b9e0fa1561e8992a3da929dfc8f6
| * 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
| | * | | | Merge "SAP: Fix below issues during internal testing"Linux Build Service Account2016-03-194-54/+53
| | |\ \ \ \
| | | * | | | SAP: Fix below issues during internal testingSmriti Gupta2016-03-094-54/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove wait for shutdown to complete on main thread. Perform cleanup for handler and quit looper from closeService running on worker thread on first SHUTDOWN message. Check and allow posting of SHUTDOWN message only if later doesnt not already exists in mSessionStatusHandler message queue. 2. Change timeout from 25 sec to 30 secs as per the standards. 3. Add debug and verbose logs whereever needed. Change-Id: I42245dfb11a7750c5cde8213181e03defcfeedb4
| | * | | | | Bluetooth-OPP: Use long instead of intSravan Kumar V2016-03-106-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes issue of problems in sending/receiving files which cannot be accomodated in int type of Java. Instead of using int, long data type is used. Change-Id: I58c9b49f59d47f6f162156eb6594e66731732580
| | * | | | | MAP: Fix ANR due wait on shutdown complete.Ashwini Munigala2016-03-012-46/+41
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove wait for shutdown to complete on main thread. Perform cleanup for handler and quit looper from closeService running on worker thread on first SHUTDOWN message. Check and allow posting of SHUTDOWN message only if later doesnt not already exists in mSessionStatusHandler message queue. CRs-Fixed: 975531 Change-Id: I67d90a8d97aebd055286029c0ccf39126a62e8ba
| | * | | | MAP: Handle following in MAPS:Ashwini Munigala2016-03-014-17/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Expose isMapStarted() API to maintain the Profile internal state and perform start/stop based on later. - Track registration and unregistration for BluetoothMapAppObserver BroadcastReceiver through a instance flag to avoid possible IntentReceiver leaks. - Avoid MasInstance shutdown block to handle possible ANR. - Other conditional checks to avoid possible NPE. CRs-Fixed: 969230 Change-Id: I473f8ad8998a1bf7f2da3bcab2380ed0954ed8bc
| * | | | | Automatic translation importMichael Bestas2016-04-065-1/+138
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ca05263e7935a11d9c8e01a1684d975871250d2
* | | | | | Automatic translation importAbhisek Devkota2016-05-147-2/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I15da29e6b5c94cdf38446fd2cb8c6a24e0d0248a Ticket: RM-231