summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505aBrint E. Kriebel2014-06-3068-568/+1582
|\
| * Bluetooth: Fix the buildMichael Bestas2014-06-301-1/+0
| | | | | | | | Change-Id: I0226e3b1366a1467651e6174c65d55c9a3097a3d
| * Automatic translation importMichael Bestas2014-06-3032-25/+540
| | | | | | | | Change-Id: Ia195cdd27c4484063b17f1c89f87e231a9595359
| * Bluetooth: Move cm_strings to cm_cafMichael Bestas2014-06-2511-0/+0
| | | | | | | | Change-Id: Ib69b8aeaf6a98349c37421129b031a25cf4da4ea
| * Automatic translation importMichael Bestas2014-06-259-240/+205
| | | | | | | | Change-Id: Iebe53525180df3b6fd93ad7400d844e0b5a74b4f
| * CYAN-3419: Major cleanup of email over Bluetooth MAPAndrew Wyman2014-06-102-138/+160
| | | | | | | | | | | | | | | | -Removed MIME hardcoding passing through to MCE -Restructured email address formatting and handling to stop confusing MCE -Added phone book lookup of contact name Change-Id: I1db4483b99d77dc9383d44292f953f822d38392a
| * Use round() instead of ceil() in calculation of a2dp vol slider positionChristian Hanner2014-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The avrcp MESSAGE_VOLUME_CHANGED requests volumes in the range 0-127. In convertToAudioStreamVolume() this value is scaled to a (typically much smaller, e.g. 0-15) integer value representing the volume slider step to be presented in the UI. Depending on the resolution in the volume requests from the a2dp device and the resolution of the UI volume slider, some of the requested volumes might be mapped onto the same UI slider positions. If ceil() is exchanged for round() in convertToAudioStreamVolume() the problem with double mapped volumes vanishes in most realistic cases. Change-Id: I89d9ac4b8c330fd4fd2a02984bd628961f2cb035
| * Bluetooth-OPP: Avoid calling incoming notification if already notifiedJuffin Alex Varghese2014-06-052-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | This change will ensure that incoming notification will not be shown again if its already displayed. Otherwise, if there is an ongoing transfer updatenotification thread will be called every 1 sec which will update the pendingnotification even if its already notified. Cleaning up Tx/Rx sessions if user abort occurs. Otherwise, cleanup happens only transfer is successful this may cause Tx/Rx failure. CRs-Fixed: 653842 Change-Id: Ifc1335849914f3032459117836473e0cd443060f
| * Bluetooth: Map: Add support to add CC list recipients in get MessagePradeep Panigrahi2014-06-051-3/+52
| | | | | | | | | | | | | | | | | | As per the present map profile email implementation cc list is not displayed in getMessage response. Add support to send recipients in cc list of email on getMessage response Change-Id: If09a245f18f3727ec678308a46d0a43cd2abf0bf CRs-fixed: 635778
| * Bluetooth: Allow A2DP Src connection while connecting other profilesAnubhavGupta2014-06-051-1/+1
| | | | | | | | | | | | | | | | - allow src connection while connecting other profiles for the first time Change-Id: I476760480e142ca5af6bea078bfdfb093b92beca CRs-Fixed: 627137
| * Bluetooth :Fix to avoid the access of JNI gloabal reference objectAjay Kumar2014-06-051-4/+7
| | | | | | | | | | | | | | | | | | | | This is a conrner case where bindandfinish gets called anytime where adapter state!= STOPPED and calls cleanupNative. Further while cleanup at lower layer will try to access JNI reference which is already deleted. Change-Id: I579bc4015b61ad653f18a5f4a3d26a2508236ff5 CRs-Fixed: 642466
| * Bluetooth: Looging for A2DPAnubhavGupta2014-06-052-2/+2
| | | | | | | | | | | | | | | | - enable logs in statemachine and a2dpservice Change-Id: I9fc6c06f091544d9cacfc6690c875557c65b1599 CRs-fixed: 601894 CRs-fixed: 601893
| * Bluetooth: Map: Bug fixes on Map Code.Pradeep Panigrahi2014-06-054-29/+41
| | | | | | | | | | | | | | | | | | | | | | | | Add bug fixes on MAP code to avoid null deferences in erroneous scenario. Avoid null dereference during a case when emailBody is null and getMessage operation is performed for that email handle. CRs-fixed: 620282 Change-Id: I4066daf88251452a21b97292817d49232c70dd76
| * PBAP: Acquire wakelock on incoming connectionSmriti Gupta2014-06-051-0/+32
| | | | | | | | | | | | | | | | | | | | Acquire wakelock on incoming connection to make the screen active. It was done so that the user can reply to the connection request if the screen is OFF on incoming connection. Change-Id: I4dfc217cbdd7a55ec43172dd8236ee197207224d CRs-Fixed: 634130
| * Bluetooth: Free bd_addr in avrcp getRcFeature callbackGubbala Venugopal Rao2014-06-051-0/+1
| | | | | | | | | | | | | | | | Free bd_addr received in avrcp getRcFeature callback to avoid JNI local reference table overflow Error in AVRCP JNI. CRs-Fixed: 630129 Change-Id: I4f98adbbc23516dd2887b263e0128cdf183b2280
| * Bluetooth: Making Intent for pairing in foreground.Rohit Singh2014-06-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | During BT ON when headset is previously connected and second device is trying to pair, Intent ACTION_PAIRING_REQUEST is not received by application in time. Changes made to make ACTION_PAIRING_REQUEST in foreground. CRs-Fixed: 612574 Change-Id: I6b98fbb73a1b1f2d1794f02713578d24988e456f
| * Bluetooth: Update Current Track and Total Track number.Gaurav Asati2014-06-051-3/+1
| | | | | | | | | | | | | | | | Add correct values for current and total track numbers in meta data Change-Id: I806c8d913818e8e5a1ecbe1641ea4ed87e3ee3c7 CRs-Fixed: 627869
| * Bluetooth: Catch RuntimeException while setting system propertyPradeep Panigrahi2014-06-051-9/+14
| | | | | | | | | | | | | | | | | | Add change to catch RuntimeException while setting system property to prevent crash in bluetoothShare, if we are unable to set system property during BT on/off stress test. Change-Id: I3e89569639d4ecbd94fe805ab2350a259f4fec68 CRs-fixed: 627455
| * Merge tag 'android-4.4.3_r1' into HEADRicardo Cerqueira2014-06-0314-84/+478
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 4.4.3 release 1 Conflicts: src/com/android/bluetooth/a2dp/Avrcp.java src/com/android/bluetooth/btservice/AdapterService.java src/com/android/bluetooth/gatt/GattService.java src/com/android/bluetooth/map/BluetoothMapContent.java src/com/android/bluetooth/map/BluetoothMapObexServer.java src/com/android/bluetooth/map/BluetoothMapService.java src/com/android/bluetooth/map/BluetoothMnsObexClient.java src/com/android/bluetooth/pbap/BluetoothPbapService.java Change-Id: I94ec3d09e5ff3644ed02206e28f9b90cd28aac37
| | * DO NOT MERGE: Add status callback for start/stop advertising.Wei Wang2014-03-202-7/+77
| | | | | | | | | | | | | | | cherrypick from master to fix b/13289050 Change-Id: I666969442b756ce461ff64eff0d09f5283431fb3
| | * Merge "DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile ↵Zhihai Xu2014-03-123-3/+60
| | |\ | | | | | | | | | | | | to avoid waste power." into klp-dev
| | | * DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to ↵Zhihai Xu2014-03-083-3/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid waste power. bug:11138488 Change-Id: Ie7d8903cc917aee51711fa47f275863e4046f3d8
| | * | Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. ↵Wei Wang2014-03-101-0/+1
| | |\ \ | | | |/ | | |/| | | | | fix b/13226130." into klp-dev
| | | * DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix ↵Wei Wang2014-03-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/13226130. Cherry picking ble advertising changes from master to KLP MR2. b/13137996 Change-Id: Iba48f4757a6b54911277900b875d83eaa81488b7
| | * | DO NOT MERGE MAP: fixed missing filtering on Prioritykschulz2014-03-081-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FilterPriority was ignored in the code as SMS does not have priority. This fixes the support for the priority filter for sms + mms. NOTICE: sms messages does not have priority and hence will return an empty messagelisting if the client requests a list with priority filter set til high-pri only. Bug: 11168636 Change-Id: If028e47850323d20d1e9a23bc947782ae8da1df0
| | * | DO NOT MERGE update play status based on A2dp audio state from stack.Zhihai Xu2014-03-073-5/+49
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is to work around the problem:some video/audio player didn't update the play status by calling setPlaybackState. The headset(HBS730) register the play status update on the phone. It will depend the play status reported from the phone to send play or pause command. bug:11325212 Change-Id: I7fde5960edd4a5b3474fa17456aacd5b4b432d4d
| | * Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into ↵Wei Wang2014-03-086-76/+327
| | |\ | | | | | | | | | | | | klp-dev
| | | * DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.Wei Wang2014-03-066-76/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add advertising data to Gatt Service/ Cherry picking ble advertising changes from master to KLP MR2. b/13137996 Change-Id: I0ea7df8c159ad388d8e58768c49e785e9a4694bb
| | * | Device cannot go to sleep while connected to HBM-570 BT headsetZhihai Xu2014-03-062-2/+45
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The headset never disconnect the Obex connection for PBAP, so in this case, we never release the wakelock. Our PBAP implementation won't release wakelock until the Obex is disconnected by the remote device To better control the wake lock, we should only acquire the wakelock when we receive the reqeust from the remote device will release the wakelock after we send the response packets. bug:10957699 Change-Id: I85e0609e36788d9c36334dd804ec52c90b90615b
| | * am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use ↵Daniel Cashman2014-01-150-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | pathPrefix filter instead of path for /btopp content" into jb-mr1-dev * commit 'e9428c35344af989f9e643964a81e2dc0ce1ffe1': Use pathPrefix filter instead of path for /btopp content
| | | * am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix ↵Daniel Cashman2014-01-150-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter instead of path for /btopp content" into jb-mr1-dev * commit '7677468ea5a2a71780e8bcf69a97c939b2ebc39b': Use pathPrefix filter instead of path for /btopp content
| | | | * am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead ↵Daniel Cashman2014-01-150-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of path for /btopp content" into jb-mr1-dev * commit '884362fee9df9f2c61d61bc0926033de82e58f14': Use pathPrefix filter instead of path for /btopp content
| | | | | * am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for ↵Daniel Cashman2014-01-150-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /btopp content" into jb-mr1-dev * commit 'ada9e95000f65d4ad7e5c697d48c76e6b9e54cf0': Use pathPrefix filter instead of path for /btopp content
| | | | | | * am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp ↵Daniel Cashman2014-01-150-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content" into jb-mr1-dev * commit '727741cd610b35e675e7b7769ddf431e5763344d': Use pathPrefix filter instead of path for /btopp content
| | | | | | | * Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-devDaniel Cashman2014-01-150-0/+0
| | | | | | | |\
| | | | | | | | * Use pathPrefix filter instead of path for /btopp contentMatthew Xie2014-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path is doing a full path match. It did not guard /btopp/ also fix a minor problem in tests/AndroidManifest.xml bug 11148516 Change-Id: I8f4a614f999e643e8ae122baf0bf898b2b3008d5 Conflicts: tests/AndroidManifest.xml
| | * | | | | | | am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am ↵Matthew Xie2014-01-130-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content * commit 'c4d45b2f898d77b61f8614e22645bfb8ecd00930': Use pathPrefix filter instead of path for /btopp content
| | | * | | | | | am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am ↵Matthew Xie2014-01-130-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deb7bdad: Use pathPrefix filter instead of path for /btopp content * commit 'e6643ed4cbe6d5ebe4f1a4979a78f81f6aeff1f0': Use pathPrefix filter instead of path for /btopp content
| | | | * | | | | am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use ↵Matthew Xie2014-01-130-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pathPrefix filter instead of path for /btopp content * commit '125338015bd96550c2d15d87a506640499820885': Use pathPrefix filter instead of path for /btopp content
| | | | | * | | | am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter ↵Matthew Xie2014-01-131-1/+1
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of path for /btopp content * commit '8e13dea5f919737738db6e38c56cc83f43a7d555': Use pathPrefix filter instead of path for /btopp content
| | | | | | * | | am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path ↵Matthew Xie2014-01-131-1/+1
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for /btopp content * commit 'fdcf402834c3f108a085a9c9b2f3be4848174f3b': Use pathPrefix filter instead of path for /btopp content
| | | | | | | * | am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp ↵Matthew Xie2014-01-131-1/+1
| | | | | | | |\ \ | | | | | | | | |/ | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content * commit 'a162ec5d684e4bf3e14ef1ddbd4a910c82915b93': Use pathPrefix filter instead of path for /btopp content
| | | | | | | | * am deb7bdad: Use pathPrefix filter instead of path for /btopp contentMatthew Xie2014-01-131-1/+1
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'deb7bdad8cbe0501d414fdec698387714837f927': Use pathPrefix filter instead of path for /btopp content
| | | | | | | | | * Use pathPrefix filter instead of path for /btopp contentMatthew Xie2014-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path is doing a full path match. It did not guard /btopp/ also fix a minor problem in tests/AndroidManifest.xml bug 11148516 Change-Id: I8f4a614f999e643e8ae122baf0bf898b2b3008d5 Conflicts: tests/AndroidManifest.xml
| | * | | | | | | | am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp ↵Matthew Xie2014-01-130-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content * commit 'bf0aa27ec7e106deb4fe61a10deebffcfe68b4bd': Use pathPrefix filter instead of path for /btopp content
| | | * | | | | | | am 14b74c3c: Use pathPrefix filter instead of path for /btopp contentMatthew Xie2014-01-131-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '14b74c3c20e06cb69b4b624c3ebb9b72bb14090d': Use pathPrefix filter instead of path for /btopp content
| | | | * | | | | | Use pathPrefix filter instead of path for /btopp contentMatthew Xie2014-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path is doing a full path match. It did not guard /btopp/ also fix a minor problem in tests/AndroidManifest.xml bug 11148516 Change-Id: I8f4a614f999e643e8ae122baf0bf898b2b3008d5 Conflicts: tests/AndroidManifest.xml
| | * | | | | | | | Merge "Use pathPrefix filter instead of path for /btopp content" into klp-devDaniel Cashman2014-01-132-2/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Use pathPrefix filter instead of path for /btopp contentMatthew Xie2014-01-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path is doing a full path match. It did not guard /btopp/ also fix a minor problem in tests/AndroidManifest.xml bug 11148516 (cherry picked from commit 2819c1dbef39a712ab8adfcd36d2cb01f2379259) Change-Id: I00b23e5c3a98422c2dd1cc220f2c121578ff5c8f
| | * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-01-062-2/+2
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8452ddf1d6c278a8c0e8de1f501f000d5bcc8525 Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 10:09:01 +0000