summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "SAP: Fix Klocwork issues."Linux Build Service Account2014-10-281-3/+6
|\ \
| * | SAP: Fix Klocwork issues.Smriti Gupta2014-10-161-3/+6
| | | | | | | | | | | | | | | | | | | | | This change will fix the Klocwork issues in SapService. Change-Id: Iea5ff1b348431c581bcbb66b7b68478fc365a6a9 CRs-fixed: 740239
* | | Merge "PBAP C: Fix klocwork issues in PbapClientTestActivity"Linux Build Service Account2014-10-281-27/+51
|\| |
| * | PBAP C: Fix klocwork issues in PbapClientTestActivitySmriti Gupta2014-10-161-27/+51
| |/ | | | | | | | | | | | | This change will add changes to fix klocwork issues. Change-Id: I0fda41f3611384bfc3d8183715dd5206657d29fd CRs-fixed: 740181
* | Merge "Bluetooth-Wipower: MTP continues advertising WPT UUID post connection."Linux Build Service Account2014-10-251-4/+13
|\ \ | |/ |/|
| * Bluetooth-Wipower: MTP continues advertising WPT UUID post connection.Kiran Kelageri2014-10-221-4/+13
|/ | | | | | | | | | | | | | | a> Stack conitnues to advertise post connection which would lead to cross connection with other PTU within vicinity, So as to avoid rest of PTU's scanning the DUT which continues to advertise, Advertiements are being stopped post connection. b> .setTimeout() with any value less than 180Sec as parameter ensures that it sets the limited mode advertising. since wipower spec demands the advertisement mode to be limited this partciular change is been made and the timeout value is been set to 30Secs which is far enough for PTU to initiate connection. Change-Id: Id63bcc19d714d087fcb6c78553572b649f106580 CRs-fixed: 734301
* Merge "Bluetooth: Update Call options on Screen Unlock."Linux Build Service Account2014-10-141-0/+37
|\
| * Bluetooth: Update Call options on Screen Unlock.Gaurav Asati2014-10-101-0/+37
| | | | | | | | | | | | | | | | - Update UI with proper call options when new calls are added in during locked screen. Change-Id: I6e1393b8a8e3308fd569918c0338ae96123a407a CRs-Fixed: 737180
* | Merge "Bluetooth: Pxpmonitor DeviceActivity Crash When HOGP Device Connected"Linux Build Service Account2014-10-141-1/+1
|\ \
| * | Bluetooth: Pxpmonitor DeviceActivity Crash When HOGP Device ConnectedSwami Dhyan Anurag2014-10-131-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | DeviceActivity in Pxpmonitor is destoryed and restarted by Android framework on change of configuration. During restart there is delay in getting the Service Connection status which return the Proxy Service Handle on successful connection. This Proxy Service handle was deferenced without null check. Added check to deference proxyService handle only when it is available. Change-Id: Ic67549e34289181bafbdae5d3a98113177aa9981 CRs-Fixed: 738143
* | Merge "Bluetooth : Fix PXP LPP app link loss reconnection"Linux Build Service Account2014-10-102-28/+46
|\ \
| * | Bluetooth : Fix PXP LPP app link loss reconnectionSatish kumar sugasi2014-10-032-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | When BLE link loss reconnection happens,the host is not able to send Vendor specific commands to the controller to start monitoring the RSSI values. CRs-Fixed: 733771 Change-Id: I8b6fd522b2040fd4529d9f1bbc87d4e8adb25474
* | | Merge "MAPC: Fix NullPointerException for ObexTime and dateTimeformat."Linux Build Service Account2014-10-101-3/+5
|\ \ \
| * | | MAPC: Fix NullPointerException for ObexTime and dateTimeformat.Ashwini Munigala2014-10-071-3/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | Handle possible NullPointerException for simpleDateFormat from BTTestApp MAPTestActivity. Change-Id: I9bf3eff2f6f4bc688d9187c7bc7da8365ed2a954 CRs-fixed: 735064
* | | Merge "Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.182' into HEAD"Linux Build Service Account2014-10-060-0/+0
|\ \ \
| * \ \ Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.182' into HEADZhoulu Luo2014-10-021-0/+9
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | AU_LINUX_ANDROID_KK.04.04.04.010.182 based on quic/aosp/kk Change-Id: Ia5edee73c03f2b0d2f8c4c20aa020b85f7353599
| | * | Merge "PBAP C: Do abort when going back to Main Activity"Linux Build Service Account2014-10-011-0/+9
| | |\ \
| | | * | PBAP C: Do abort when going back to Main ActivitySmriti Gupta2014-09-301-0/+9
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will abort the current ongoing phonebook download when going back to the Main Activity from the Phonebook activity since the Pbap Activity is no longer active. Change-Id: I7aa77fbb2d958497dc0c41625835fadeb35f112f CRs-fixed: 731540
| | * | Merge "FTP: Avoid ServerSocket leak and cleanup unnecessary code."Linux Build Service Account2014-09-301-2/+0
| | |\ \
| | | * | FTP: Avoid ServerSocket leak and cleanup unnecessary code.Ashwini Munigala2014-09-261-2/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning serverSocket to NULL when IOException occurs on connection socket is not required. Also without a proper closure for RFCOMMServerSocket before assigning it to NULL would cause a socket leak. Change-Id: I99dfcd03f5f73b30fe1763cffcb2a00baed93286 CRs-fixed: 715033
* | | | Merge "PBAP C: Do abort when going back to Main Activity"Linux Build Service Account2014-10-021-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | PBAP C: Do abort when going back to Main ActivitySmriti Gupta2014-09-301-0/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This change will abort the current ongoing phonebook download when going back to the Main Activity from the Phonebook activity since the Pbap Activity is no longer active. Change-Id: I7aa77fbb2d958497dc0c41625835fadeb35f112f CRs-fixed: 731540
* | | Merge "Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.171' into HEAD"Linux Build Service Account2014-10-011-0/+258
|\ \ \
| * \ \ Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.171' into HEADZhoulu Luo2014-09-241-0/+258
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | AU_LINUX_ANDROID_KK.04.04.04.010.171 based on quic/aosp/kk Conflicts: src/org/codeaurora/bluetooth/pbapclient/BluetoothPbapObexSession.java Change-Id: I6366caf12520543f172ec7006099ca135cf5e896
| | * | Merge "PBAP C: Run the abort operation in a seperate thread"Linux Build Service Account2014-09-201-6/+9
| | |\ \
| | | * | PBAP C: Run the abort operation in a seperate threadSmriti Gupta2014-09-191-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change has been done to start the ABORT in a seperate thread so that it doesn't block the main thread. The new thread was not spawned properly with the old implementation. Change-Id: I0676e11e1ccdbbd9f9c7d1378293e12a3059bd04 CRs-Fixed: 720092
| | * | | Merge "PBAP C: Set visibility of contact list to false on failure"Linux Build Service Account2014-09-201-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | PBAP C: Set visibility of contact list to false on failureSmriti Gupta2014-09-161-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will set the visibility of last server contact list to "false" on connection failure with the second DUT which was not happening earlier because of stopProgressBarDownload() function. Change-Id: I3c1ea56c45d68c51857f6fbad379c2dd8e0a22aa CRs-Fixed: 706022
| | * | Merge "Bluetooth: Fix to avoid DUN crash due to incorrect readIndex"Linux Build Service Account2014-08-261-116/+121
| | |\ \
| | | * | Bluetooth: Fix to avoid DUN crash due to incorrect readIndexNitin Shivpure2014-08-251-116/+121
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix to avoid indexOutOfBoundsException due to incorrect readIndex in DownlinkThread after reading response from Dun Server while disconnecting DUN from PC side. - Added Dynamic Verbose logging support - Optimized DUN Service code Change-Id: Ia7c3392e92e84b9c7e3cbdb62ea0ae9224588b5c CRs-Fixed: 702364
* | | | Merge "FTP: Avoid ServerSocket leak and cleanup unnecessary code."Linux Build Service Account2014-09-291-2/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | FTP: Avoid ServerSocket leak and cleanup unnecessary code.Ashwini Munigala2014-09-261-2/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning serverSocket to NULL when IOException occurs on connection socket is not required. Also without a proper closure for RFCOMMServerSocket before assigning it to NULL would cause a socket leak. Change-Id: I99dfcd03f5f73b30fe1763cffcb2a00baed93286 CRs-fixed: 715033
* | | Merge "Revert "Bluetooth-Wipower: Add compilation flag""Linux Build Service Account2014-09-241-8/+5
|\ \ \ | |/ / |/| |
| * | Revert "Bluetooth-Wipower: Add compilation flag"Hemant Gupta2014-09-231-8/+5
|/ / | | | | | | | | | | | | | | | | This reverts commit 841649ae6f15bd13b4084e8e4eb28bc7aec49f91. Without this patch bluetooth was crashing because of missing files for wipower in bluetoothext.apk Change-Id: I3072cf88e14a95a81675742cf004ce9833517ca1 CRs-Fixed: 728710
* | Merge "Bluetooth-Wipower: Add compilation flag"Linux Build Service Account2014-09-211-5/+8
|\ \
| * | Bluetooth-Wipower: Add compilation flagHemant Gupta2014-09-171-5/+8
| | | | | | | | | | | | | | | | | | | | | This patch puts wipower code under target specifc compilation flag. Based on target, wipower is enabled or disabled. Change-Id: Ia7a31ad119313cdafee8aaab52b404693f8e8da5
* | | Merge "Bluetooth-Wipower: Stop Advertisment on disconnect."Linux Build Service Account2014-09-201-3/+5
|\ \ \
| * | | Bluetooth-Wipower: Stop Advertisment on disconnect.Kiran Kelageri2014-09-181-3/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Stopping advertisment on disconnect, Connection state is been maintained to avoid unncessary clean-up of wipower activity. state is been added to avoid sending VS command to get the wipower state. Change-Id: Icf9eafa72a67a4def746f5132dea0e341d7412c0 CRs-fixed: 726742
* | | Merge "PBAP C: Set visibility of contact list to false on failure"Linux Build Service Account2014-09-181-2/+2
|\ \ \ | |/ / |/| |
| * | PBAP C: Set visibility of contact list to false on failureSmriti Gupta2014-09-161-2/+2
|/ / | | | | | | | | | | | | | | | | This change will set the visibility of last server contact list to "false" on connection failure with the second DUT which was not happening earlier because of stopProgressBarDownload() function. Change-Id: I3c1ea56c45d68c51857f6fbad379c2dd8e0a22aa CRs-Fixed: 706022
* | Merge "Bluetooth-Wipower: Enable A4WP service using adb"Linux Build Service Account2014-09-101-1/+1
|\ \
| * | Bluetooth-Wipower: Enable A4WP service using adbKiran Kelageri2014-09-091-1/+1
|/ / | | | | | | | | | | | | Support for enabling/Disabling A4WP service dynamically during run time using ADB. Change-Id: If599a58d75551375dc1c6479c3b9ea70c2061a47
* | Merge "Bluetooth-Wipower: Cleanup activity for wipower on disconnect."Linux Build Service Account2014-09-091-1/+3
|\ \
| * | Bluetooth-Wipower: Cleanup activity for wipower on disconnect.Kiran Kelageri2014-09-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is been added as part of cleanup activity if and only if there exists a wipower connection. This will also enusure unnecessary cleaup being called which would lead to null dereferencing. Change-Id: I6d4666be82dbb1a1d84d42d4326db934676d27d6
* | | Merge "HiddTestApp: Use single button for play and pause."Linux Build Service Account2014-09-063-8/+10
|\ \ \ | |/ / |/| |
| * | HiddTestApp: Use single button for play and pause.Hemant Gupta2014-09-033-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses Play/Pause as single button which has different usage ID 0xCD instead of separate buttons for Play (usage id 0xB0) and Pause (usage id 0xB1) as different buttons are causing issues with pausing media with several commercial devices which work with single play/pause device usage id hid implemenation. Change-Id: I5dfe801dcd57e044ef69adecfe2bd88be5a9eaf9 CRs-Fixed: 718821
* | | Merge "Bluetooth-Wipower: Compilation fix for Wipower."Linux Build Service Account2014-09-051-1/+1
|\ \ \
| * | | Bluetooth-Wipower: Compilation fix for Wipower.Kiran Kelageri2014-09-041-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Change has been made based on compilation issue due to API being renamed on latest baseline. Change-Id: Id3604b9a6be16a26d05b29a2d9efd23ea18c3805
* | | Merge "Bluetooth-wipower: Enabling A4WP Profile."Linux Build Service Account2014-09-043-22/+30
|\ \ \
| * | | Bluetooth-wipower: Enabling A4WP Profile.Kiran Kelageri2014-08-273-22/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes have been made to enable A4WP profile and adevrtising API based on the Google peripheral code changes. Change-Id: I60a9ebf70da5f073a2046a407ddf8cc0a4f74399 CRs-fixed: 713981