OSDN Git Service
Matthew Xie [Thu, 7 Nov 2013 22:10:46 +0000 (14:10 -0800)]
am
3987efa9: Merge "LE: Fix stack crash on invalid descriptor write request" into klp-dev
* commit '
3987efa998a9bfbf148f83b286bfc3aeae62d87c':
LE: Fix stack crash on invalid descriptor write request
Matthew Xie [Thu, 7 Nov 2013 22:08:31 +0000 (22:08 +0000)]
Merge "LE: Fix stack crash on invalid descriptor write request" into klp-dev
Andre Eisenbach [Fri, 1 Nov 2013 21:54:22 +0000 (14:54 -0700)]
LE: Fix stack crash on invalid descriptor write request
Fix stack crash when an application attempts to writes a NULL array
using the writeDescriptor() function.
bug
11574019
Change-Id: Id2d7e49216fcc6e3af369047005fb7e67e0923db
Matthew Xie [Thu, 7 Nov 2013 05:51:44 +0000 (21:51 -0800)]
am
cd68000c: Merge "cancel device discovery before start pairing process" into klp-dev
* commit '
cd68000c2c9eb487a4bdb718d966a3246fef4d59':
cancel device discovery before start pairing process
Matthew Xie [Thu, 7 Nov 2013 05:49:26 +0000 (05:49 +0000)]
Merge "cancel device discovery before start pairing process" into klp-dev
Matthew Xie [Wed, 6 Nov 2013 19:10:37 +0000 (11:10 -0800)]
cancel device discovery before start pairing process
During pairing process, SDP search is needed which cannot be handled
if we are doing device discovery
bug
11294130
Change-Id: Ic025fa3000af4f2d4c2c2ac411d26b6a99ad097c
Zhihai Xu [Wed, 6 Nov 2013 00:20:00 +0000 (16:20 -0800)]
am
240e2c5c: Merge "FF/REW is not correctly for AVRCP." into klp-dev
* commit '
240e2c5c8248747f0fac86d173a9161d09093d47':
FF/REW is not correctly for AVRCP.
Zhihai Xu [Wed, 6 Nov 2013 00:15:52 +0000 (00:15 +0000)]
Merge "FF/REW is not correctly for AVRCP." into klp-dev
Edward Jee [Tue, 5 Nov 2013 23:11:47 +0000 (15:11 -0800)]
am
dedebbfb: Handles AT+BVRA=1 received during an open SCO session.
* commit '
dedebbfb6eb1af92f013dedd234c2162cc2ec4be':
Handles AT+BVRA=1 received during an open SCO session.
Edward Jee [Tue, 8 Oct 2013 22:19:14 +0000 (15:19 -0700)]
Handles AT+BVRA=1 received during an open SCO session.
Bug:
11072505
Change-Id: If665517cd9efa087154edd57b23163e7cc098f6f
Baligh Uddin [Tue, 5 Nov 2013 15:53:02 +0000 (07:53 -0800)]
am
79098ae2: (-s ours) Import translations. DO NOT MERGE
* commit '
79098ae27876a881e865e029d2c91db5bc4e498d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Nov 2013 16:15:07 +0000 (08:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5ca5b6507989bc70ccc1cb5790e9a5b8b45caeb4
Auto-generated-cl: translation import
Zhihai Xu [Sat, 2 Nov 2013 00:28:42 +0000 (17:28 -0700)]
am
9dc561f7: Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev
* commit '
9dc561f7f13569552a62f771b16fe35dc5b9cd16':
NPE in bluetooth MAP cause bluetooth process crash
Zhihai Xu [Fri, 1 Nov 2013 23:39:51 +0000 (23:39 +0000)]
Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev
Zhihai Xu [Fri, 1 Nov 2013 23:19:14 +0000 (16:19 -0700)]
FF/REW is not correctly for AVRCP.
While a music is being played, if FF/REW is pressed on the connected device,
it remains in the FF/REW state constantly (on the Porsche / Audi A8 carkit)
bug:
11377223
Change-Id: Iee5468308f2786839c3a047c95dfa0a49ef28efb
Zhihai Xu [Thu, 31 Oct 2013 02:41:16 +0000 (19:41 -0700)]
NPE in bluetooth MAP cause bluetooth process crash
bug:
11448104
Change-Id: I30045162c89e2150a9ef476f33e1b322e7cc9a44
Baligh Uddin [Mon, 28 Oct 2013 19:34:16 +0000 (12:34 -0700)]
am
80be110d: (-s ours) Import translations. DO NOT MERGE
* commit '
80be110dc97436264d402adb62f8c1c631fd36e9':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Oct 2013 15:18:25 +0000 (08:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I75b1aeb7c88fa9a3c678f91a2d88a95fa63f80df
Auto-generated-cl: translation import
Zhihai Xu [Wed, 23 Oct 2013 23:35:20 +0000 (16:35 -0700)]
am
82492947: MAP: fix problem with MNS not disconnecting correctly
* commit '
824929471ee80476e6d6774eedac9f30c5623eb2':
MAP: fix problem with MNS not disconnecting correctly
Zhihai Xu [Wed, 23 Oct 2013 00:48:06 +0000 (17:48 -0700)]
MAP: fix problem with MNS not disconnecting correctly
MNS is needed to disconnect with the MSE but did not.
This patch fixes that by re-adding a disconnect() that was wrongfully removed during review.
Patch set 2:
-----------
- Split disconnect and shutdown for MNS connection
bug:
11161674
Change-Id: Idd09fc774584dfdb171b0d00be0f7711ae57b853
Matthew Xie [Mon, 21 Oct 2013 23:05:23 +0000 (16:05 -0700)]
am
dce8f102: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
* commit '
dce8f102f76aeea3356c5416b8ebb5e5c8b5cb22':
Change pairing api/intent permission from PRIVILEGED to ADMIN
Matthew Xie [Mon, 21 Oct 2013 22:59:05 +0000 (22:59 +0000)]
Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
Matthew Xie [Mon, 21 Oct 2013 22:07:29 +0000 (15:07 -0700)]
Change pairing api/intent permission from PRIVILEGED to ADMIN
The APIs are createBond, setPin, setPairingConfirmation
The intent is ACTION_PAIRING_REQUEST
bug
11101076
Change-Id: I3b065ab0348a964bb557e57527491b2f34e68a81
Zhihai Xu [Fri, 18 Oct 2013 21:50:52 +0000 (14:50 -0700)]
am
311fd8bf: Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345
* commit '
311fd8bf28c1c16c4da81485b26518c8df97f50b':
Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345
Zhihai Xu [Thu, 17 Oct 2013 19:07:46 +0000 (12:07 -0700)]
Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345
the handleRegistration will never run after we shutdown the handler thread first,
with this change, we can make sure the mObserver will never be null
when call handleRegistration.
bug:
11148404
Change-Id: I93b351915b49cf59a7d2026b7d83a68a7e76dd38
Ed Heyl [Thu, 17 Oct 2013 00:51:50 +0000 (17:51 -0700)]
Ed Heyl [Thu, 17 Oct 2013 00:44:43 +0000 (17:44 -0700)]
merge in klp-release (no-op)
The Android Automerger [Sun, 13 Oct 2013 13:02:15 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Casper Bonde [Fri, 11 Oct 2013 22:54:37 +0000 (15:54 -0700)]
am
98df3e8f: Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app
* commit '
98df3e8ff33a6137d4ea13845b583aaee2670613':
Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app
Casper Bonde [Fri, 11 Oct 2013 13:01:04 +0000 (15:01 +0200)]
Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app
When MAP and PBAP requests authorization from the Settings app via Intents,
it also sets a state isWaitingForAuthorization to indicate
that it should handle incoming replies.
This is however done in the code after the intent have been sent
and in some cases the reply for the intent is returned
before the state has been update = no handling of the reply.
This only happens on the second connect with a paired device and
only when the user have selected the "do not ask again" checkmark
in the popup requesting access.
FIX:
Move the update of isWaitingAuthorization to before sending the intent to settings
bug:
11179645
Change-Id: I25b019e32a01caa8509c8f97195712120823afa9
Edward Jee [Thu, 10 Oct 2013 20:09:38 +0000 (13:09 -0700)]
am
c3cbf72f: Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
* commit '
c3cbf72f596c2af659905e06e85a5ac1241610a8':
Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
Edward Jee [Sat, 5 Oct 2013 01:01:55 +0000 (18:01 -0700)]
Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
Now we use sendOrderedBroadcast for ACTION_PAIRING_REQUEST , and to
receive this intent, BLUETOOTH_PRIVILEGED is required.
Bug:
11087521
Change-Id: I6aa2fbc6538df39b24f141e7d75adc3658a7e7ac
The Android Automerger [Thu, 10 Oct 2013 13:01:20 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Zhihai Xu [Thu, 10 Oct 2013 00:46:29 +0000 (17:46 -0700)]
am
c14e9468: Merge "Remove MMS support from MAP profile" into klp-dev
* commit '
c14e9468d79579bda0e6f15823ffb53c30e831a1':
Remove MMS support from MAP profile
Zhihai Xu [Thu, 10 Oct 2013 00:44:36 +0000 (00:44 +0000)]
Merge "Remove MMS support from MAP profile" into klp-dev
Zhihai Xu [Wed, 9 Oct 2013 23:26:00 +0000 (16:26 -0700)]
Remove MMS support from MAP profile
reject to push MMS message, will support it in the future
bug
10296324
Change-Id: Idf2aa081b049e323422223d7b24f6404de2d7184
Ed Heyl [Tue, 8 Oct 2013 22:47:49 +0000 (15:47 -0700)]
am
205b3775: merge in KQS81M
* commit '
205b3775e344734c9aa0776a8ee14d2cde1f411e':
Add MEDIA_CONTENT_CONTROL permission
Ed Heyl [Tue, 8 Oct 2013 22:42:05 +0000 (15:42 -0700)]
merge in KQS81M
The Android Automerger [Tue, 8 Oct 2013 13:00:54 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Jean-Michel Trivi [Mon, 7 Oct 2013 17:07:23 +0000 (10:07 -0700)]
am
ce827197: Merge "Update AVRCP implementation of IRemoteControlDisplay" into klp-dev
* commit '
ce8271970cbfaf3ba52250a9b02e6f73f87fef70':
Update AVRCP implementation of IRemoteControlDisplay
Jean-Michel Trivi [Mon, 7 Oct 2013 17:04:41 +0000 (17:04 +0000)]
Merge "Update AVRCP implementation of IRemoteControlDisplay" into klp-dev
The Android Automerger [Sun, 6 Oct 2013 13:01:40 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Baligh Uddin [Fri, 4 Oct 2013 17:20:34 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Fri, 4 Oct 2013 17:14:32 +0000 (10:14 -0700)]
am
5d00ba23: (-s ours) Import translations. DO NOT MERGE
* commit '
5d00ba23630c3eed71f885986211754d525eec62':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Oct 2013 17:13:00 +0000 (10:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I028376e1ae65fa0517945c2eb2e73cedccd1037f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 4 Oct 2013 17:12:11 +0000 (10:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4aa104f811eb821da26ed448b93ae70bbb87712a
Auto-generated-cl: translation import
Jean-Michel Trivi [Fri, 4 Oct 2013 01:06:17 +0000 (18:06 -0700)]
Update AVRCP implementation of IRemoteControlDisplay
Add implementation of new method in IRemoteControlDisplay.
Bug
8209392
Change-Id: Ic700be5476cb2f70b6a26098cbed3e8e130b3573
The Android Automerger [Tue, 1 Oct 2013 13:01:11 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Matthew Xie [Mon, 30 Sep 2013 18:57:02 +0000 (18:57 +0000)]
Merge "Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED" into klp-dev
The Android Automerger [Sun, 29 Sep 2013 13:01:29 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Matthew Xie [Tue, 24 Sep 2013 07:48:48 +0000 (00:48 -0700)]
Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED
bug
9987787
Change-Id: I2fe88f4c284d8403d79e08194bf7a720b305d029
Zhihai Xu [Thu, 26 Sep 2013 23:16:50 +0000 (23:16 +0000)]
Merge "Unable to receive Text Message to CAR Kit(nuvi3580LM)" into klp-dev
Zhihai Xu [Tue, 24 Sep 2013 21:22:13 +0000 (14:22 -0700)]
Unable to receive Text Message to CAR Kit(nuvi3580LM)
The problem is when we receive the SetNotificationRegistration,
the MNS thread is not ready yet.so the notification is not enabled.
so we won't send new message notification to Carkit.
bug:
10898884
Change-Id: Ibaa4a92694bcbb1ea2fb4e8a3de0ff30acdafeb1
The Android Automerger [Thu, 26 Sep 2013 13:01:37 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Zhihai Xu [Wed, 25 Sep 2013 21:59:34 +0000 (21:59 +0000)]
Merge "bluetooth crash caused by read phone book with invalid colummn number -1" into klp-dev
Baligh Uddin [Wed, 25 Sep 2013 15:29:13 +0000 (08:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icd8a04f9f9c4d9564fa2dda13be067ce6cc868c8
Auto-generated-cl: translation import
Zhihai Xu [Wed, 25 Sep 2013 01:22:29 +0000 (18:22 -0700)]
bluetooth crash caused by read phone book with invalid colummn number -1
bug:
10919257
Change-Id: I584d5c5c65e26cacfab227742b98c49282710f68
The Android Automerger [Sun, 22 Sep 2013 17:51:21 +0000 (10:51 -0700)]
merge in klp-release history after reset to klp-dev
Zhihai Xu [Fri, 20 Sep 2013 20:57:12 +0000 (20:57 +0000)]
Merge "resource leakage in bluetooth MAP when empty message in phone." into klp-dev
Jean-Michel Trivi [Wed, 18 Sep 2013 03:21:22 +0000 (20:21 -0700)]
Add MEDIA_CONTENT_CONTROL permission
Required to register IRemoteControlDisplay implementation
b/
8209392
Change-Id: Ide88e9a11bcfa68e7d5e2095208e63afdb5c511e
Matthew Xie [Fri, 20 Sep 2013 17:31:09 +0000 (17:31 +0000)]
Merge "Check null condition of number before contact query" into klp-dev
Matthew Xie [Fri, 20 Sep 2013 00:25:05 +0000 (17:25 -0700)]
Check null condition of number before contact query
bug
10571304
Change-Id: Idb23e7085dc1dc7119e0e2aa8901743707e72285
Jean-Michel Trivi [Wed, 18 Sep 2013 03:21:22 +0000 (20:21 -0700)]
Add MEDIA_CONTENT_CONTROL permission
Required to register IRemoteControlDisplay implementation
b/
8209392
Change-Id: Ide88e9a11bcfa68e7d5e2095208e63afdb5c511e
Zhihai Xu [Thu, 19 Sep 2013 23:20:52 +0000 (16:20 -0700)]
resource leakage in bluetooth MAP when empty message in phone.
bug:
10844044
Change-Id: I60c1b0206d7ba4653d149bee2f9f0dd6da6a5afb
Matthew Xie [Thu, 12 Sep 2013 07:21:59 +0000 (00:21 -0700)]
Change Volume step scale. Use setStreamVolume instead of avrcpUpdateVolume
bug
10681804
Change-Id: I553dac18d48c86bdb8b11428f56956f04ea87f27
Baligh Uddin [Sun, 15 Sep 2013 02:50:46 +0000 (19:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I585f487a522776ee1c529309d359452233abed15
Auto-generated-cl: translation import
Ying Wang [Sat, 14 Sep 2013 03:47:21 +0000 (03:47 +0000)]
Merge "Fix build." into klp-dev
Ying Wang [Sat, 14 Sep 2013 03:46:08 +0000 (20:46 -0700)]
Fix build.
Change-Id: I02a9d4dfa84c5778a1136d39b7bb14a2e523a9ca
Guang Zhu [Sat, 14 Sep 2013 02:30:57 +0000 (19:30 -0700)]
disable broken tests
tests are causing build breakage
Bug:
10692365
Change-Id: Ieb4b8c6946cf2de4230f1320d940c89de53b100c
Zhihai Xu [Fri, 13 Sep 2013 23:00:43 +0000 (23:00 +0000)]
Merge "Fixes to the google review comments + spec 1.1" into klp-dev
Kim Schulz [Thu, 22 Aug 2013 08:57:59 +0000 (10:57 +0200)]
Fixes to the google review comments + spec 1.1
- updated code to comply with MAP spec 1.1
- removed activity + strings.xml
- removed unused notification code
- fixed TODOs
- added more string validation and case insensitivity
- fixed internal+google review comments
- Added dump of incoming bMessages to /sdcard/bluetooth/log when verbose debug in enabled. Only the latest received message will be stored
- Fix functions msgListingSize and msgListingHasUnread to also consider mms filter message type
- Fix wrong tag length define for notification status parameter
- Re-added shutdown code to interupt the MNS
- removed map activity
- Added initial bluetooth map unit tests
- Fix map event report xml start tag to uppercase 'MAP'
- added support for using ProfileService class
- changed the way the Broadcast Receiver was implemented
- Fixed minor bugs found during Automotive Test Event
- FilterPeriod application parameters can be present, but with zero length
- For MMS the end-boundary were added too early
- The FOLDER entry in bMessage can be empty for a message push
- Wrong error value returned for a set status operation with a wrong handle
- In getMessage() exclude all binary content and smil.xml if the appParam attachment is set to "no".
- Set correct content id and content location for mms. Fix mms mime parser bug.
- moved disconnect to Handler thread
- fixed multipart-message split bug.
- added a few Unit tests for multi-part messages
- MMS parser optimized
- fixed exception in MNS obex Client
- fixed problem with Native PDUs not getting correct timestamp
- corrected mixup in ordinator/recipient for MMS
Change-Id: I3875762822a7f8ce0132065e0da5d0257e3850a1
Bug:
10692365
Ruben Brunk [Wed, 11 Sep 2013 03:35:38 +0000 (20:35 -0700)]
Remove dependency on JNIHelp header side effects.
Bug:
10680559
Change-Id: If5c6e22dd89a41886bb72303a85ca674c60d1946
John Du [Fri, 16 Aug 2013 00:40:24 +0000 (17:40 -0700)]
Stop scan when client binder dies
bug
10213756
Change-Id: I01b397070f729df7c6000c2dc2613efbe8801681
(cherry picked from commit
45ba247afa1cb3c61a871b0c13f6546411afe68b)
Baligh Uddin [Tue, 3 Sep 2013 15:33:40 +0000 (08:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I134988fe16520246474f92a6f7b035e30d0b6afb
Auto-generated-cl: translation import
Edward Jee [Mon, 26 Aug 2013 20:33:36 +0000 (20:33 +0000)]
Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev
Baligh Uddin [Fri, 23 Aug 2013 05:23:57 +0000 (22:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0cccc9b44a66829a7f781986c6aee97c8744d17e
Auto-generated-cl: translation import
Edward Jee [Fri, 16 Aug 2013 11:10:56 +0000 (04:10 -0700)]
Enables AT+ANDROID command in Bluetooth HFP.
Adds another vendor-specific command AT+ANDROID in Bluetooth Hands-Free
Profile. And creates an API function that sends an unsolicited result
code +ANDROID .
Bug:
8736189
Change-Id: I7e5bba8a568f596565a1531948061e4d2fe456e0
Baligh Uddin [Mon, 19 Aug 2013 14:17:34 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4e94f0caf464133c4fb2e3c993d066ceeb8edb3
Auto-generated-cl: translation import
John Du [Thu, 18 Jul 2013 22:48:16 +0000 (15:48 -0700)]
Adding support for Absolute Volume
Change-Id: Ie2ccaad7aaf56a89fe44b168026df3d84b373c06
Conflicts:
jni/com_android_bluetooth_avrcp.cpp
src/com/android/bluetooth/a2dp/Avrcp.java
Baligh Uddin [Fri, 16 Aug 2013 00:25:26 +0000 (00:25 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
John Du [Fri, 28 Jun 2013 01:39:42 +0000 (18:39 -0700)]
Add support for ff/rew
Change-Id: I7ec60d94313b9ba5e4e8e62c82f19ae332b6fdd3
(cherry picked from commit
55123eff985f4d15ec198569a5db895ea086447a)
Baligh Uddin [Wed, 14 Aug 2013 16:51:16 +0000 (09:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4f19d104c3f906156a4470e4a8cc3d1e5d07c2c
Auto-generated-cl: translation import
Matthew Xie [Wed, 14 Aug 2013 08:16:08 +0000 (08:16 +0000)]
Merge "LE: Add peripheral role support (4/4)" into klp-dev
Andre Eisenbach [Wed, 7 Aug 2013 02:58:39 +0000 (19:58 -0700)]
LE: Add peripheral role support (4/4)
Initial stack support for the LE peripheral role.
Change-Id: I3600558fd777999bcd610fa3aaed259414702ea4
Matthew Xie [Wed, 14 Aug 2013 07:32:04 +0000 (07:32 +0000)]
Merge "LE: Add instance ID to descriptors (4/4)" into klp-dev
Andre Eisenbach [Tue, 9 Jul 2013 07:03:57 +0000 (00:03 -0700)]
LE: Add instance ID to descriptors (4/4)
If a remote devices offers multiple descriptors with the same UUID, the
instance ID is used to differentiate between them.
Change-Id: I176dcfe1dc582120173cf3bd2d4329d7d764e39a
Baligh Uddin [Mon, 12 Aug 2013 15:25:26 +0000 (08:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13faa9f5838b1d36fba572c47272703ae944c535
Auto-generated-cl: translation import
Matthew Xie [Fri, 19 Jul 2013 01:18:36 +0000 (18:18 -0700)]
Bluetooth MAP profile - sms and mms support initial check-in
bug:
10116530
Change-Id: If9ce878d71c1e1b12416014c433da03b3033e158
Dianne Hackborn [Mon, 5 Aug 2013 18:26:26 +0000 (11:26 -0700)]
Use explicit Intent for binding to service.
Change-Id: I51971a02532ad0ad8fafb0529e7adf83ed846cf4
Baligh Uddin [Wed, 31 Jul 2013 21:47:55 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I047f7faa69a457bc442be97e59ef0cf84d04a738
Auto-generated-cl: translation import
Zhihai Xu [Fri, 26 Jul 2013 18:33:12 +0000 (18:33 +0000)]
Merge "Add debug menu to enable btsnoop"
Jay Shrauner [Mon, 10 Jun 2013 19:03:34 +0000 (12:03 -0700)]
Use new CallLog number presentation column
Switch to using new number presentation column in the CallLog table.
Bug:
6948882
Change-Id: I5df2969465c19f2357dbbc3266315e020e30476e
The Android Open Source Project [Wed, 12 Jun 2013 14:25:54 +0000 (07:25 -0700)]
am
ca70fd76: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
ca70fd763174361aa9ed25241f94d52f94ef6387':
ignore invlaid play position update from remote control client.
The Android Open Source Project [Wed, 12 Jun 2013 14:23:39 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ie1d9fd280ad0b593e75ce17c11e45d34cf6df4ab
Zhihai Xu [Sat, 8 Jun 2013 01:12:21 +0000 (18:12 -0700)]
ignore invlaid play position update from remote control client.
differentiate between applications that use
the new RemoteControlClient APIs to pass a playback position but
don't have one yet, and applications that use the legacy API and
will never pass a position.
bug:
9294855
Change-Id: I015b9ded72497464352a9fbb6a605cedfffad373
Zhihai Xu [Tue, 11 Jun 2013 22:28:50 +0000 (15:28 -0700)]
am
7dc55aab: Merge "ignore invlaid play position update from remote control client." into jb-mr2-dev
* commit '
7dc55aab7b1e53f784ffc75d1e7e28c0ee42bb0c':
ignore invlaid play position update from remote control client.
Zhihai Xu [Tue, 11 Jun 2013 20:08:24 +0000 (13:08 -0700)]
Add debug menu to enable btsnoop
bug:
8059358
Change-Id: I2947b2b77955238410e2620489c2e0407ad8ae7b
Zhihai Xu [Tue, 11 Jun 2013 19:39:49 +0000 (19:39 +0000)]
Merge "ignore invlaid play position update from remote control client." into jb-mr2-dev
Zhihai Xu [Sat, 8 Jun 2013 01:12:21 +0000 (18:12 -0700)]
ignore invlaid play position update from remote control client.
differentiate between applications that use
the new RemoteControlClient APIs to pass a playback position but
don't have one yet, and applications that use the legacy API and
will never pass a position.
bug:
9294855
Change-Id: I015b9ded72497464352a9fbb6a605cedfffad373
Matthew Xie [Thu, 30 May 2013 22:16:12 +0000 (15:16 -0700)]
am
865b323b: Notify adapter state change from off to on when disable fails
* commit '
865b323bb1d0aa9581a9b6a2f5ed96fc0ee70b23':
Notify adapter state change from off to on when disable fails