OSDN Git Service
Qiwen Zhao [Mon, 9 Dec 2013 22:19:56 +0000 (14:19 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev
Baligh Uddin [Thu, 5 Dec 2013 21:29:56 +0000 (21:29 +0000)]
am
0dac1504: (-s ours) am
e76ce140: (-s ours) Import translations. DO NOT MERGE
* commit '
0dac150402dd11f80f71a230b20e5a82accc1927':
Zhihai Xu [Fri, 15 Nov 2013 22:41:43 +0000 (14:41 -0800)]
am
f43652de: am
025c8ec1: Merge "remove a read lock to work around a platform deadlock problem." into klp-dev
* commit '
f43652dec776a22a1306b4392867e2f0b8e855d0':
remove a read lock to work around a platform deadlock problem.
Zhihai Xu [Fri, 15 Nov 2013 22:36:25 +0000 (14:36 -0800)]
am
025c8ec1: Merge "remove a read lock to work around a platform deadlock problem." into klp-dev
* commit '
025c8ec1e42ccac17c896809c4e6d2cb90b3c71a':
remove a read lock to work around a platform deadlock problem.
Zhihai Xu [Fri, 15 Nov 2013 22:30:38 +0000 (22:30 +0000)]
Merge "remove a read lock to work around a platform deadlock problem." into klp-dev
Zhihai Xu [Fri, 15 Nov 2013 18:01:15 +0000 (10:01 -0800)]
remove a read lock to work around a platform deadlock problem.
remove the lock in getStatefunction to work around a platform
deadlock problem.and also for read access, it is safe to remove
the lock to save CPU power
bug:
11655066
Change-Id: Iddc0ada04010d95ae7d5fbc93ab837ebfc025b7a
Matthew Xie [Thu, 7 Nov 2013 22:14:13 +0000 (14:14 -0800)]
am
2c41d997: am
3987efa9: Merge "LE: Fix stack crash on invalid descriptor write request" into klp-dev
* commit '
2c41d99700f1a0512f6972d3836f9829cfa7995a':
LE: Fix stack crash on invalid descriptor write request
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:53:45 +0000 (21:53 -0800)]
am
e56c70f6: am
cd68000c: Merge "cancel device discovery before start pairing process" into klp-dev
* commit '
e56c70f66fc8fd0cbcd97999f6efe187049c062c':
cancel device discovery before start pairing process
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:48:59 +0000 (16:48 -0800)]
am
0b98b993: am
240e2c5c: Merge "FF/REW is not correctly for AVRCP." into klp-dev
* commit '
0b98b9933f0a2523ad333136777ef42982afc53a':
FF/REW is not correctly for AVRCP.
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:49:34 +0000 (15:49 -0800)]
am
981c0006: am
dedebbfb: Handles AT+BVRA=1 received during an open SCO session.
* commit '
981c0006cd7a6a4a786afd73a7a80faf571b6733':
Handles AT+BVRA=1 received during an open SCO session.
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 21:26:59 +0000 (13:26 -0800)]
am
5a35fc13: (-s ours) am
79098ae2: (-s ours) Import translations. DO NOT MERGE
* commit '
5a35fc139c772f04a1b314eb7a4062e16cfa8ebd':
Import translations. DO NOT MERGE
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
Zhihai Xu [Tue, 5 Nov 2013 05:53:33 +0000 (21:53 -0800)]
am
2665ad11: am
9dc561f7: Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev
* commit '
2665ad11e9e3794dab5f5591ec0fceafddb2d58d':
NPE in bluetooth MAP cause bluetooth process crash
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:37:07 +0000 (12:37 -0700)]
am
48892c8f: (-s ours) am
80be110d: (-s ours) Import translations. DO NOT MERGE
* commit '
48892c8fac096c33d549fbc78cacf8d53c93c154':
Import translations. DO NOT MERGE
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:38:17 +0000 (16:38 -0700)]
am
d2e9f926: am
82492947: MAP: fix problem with MNS not disconnecting correctly
* commit '
d2e9f9266d5efe9400ba0bdeca2ea61b8510e3e3':
MAP: fix problem with MNS not disconnecting correctly
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:07:44 +0000 (16:07 -0700)]
am
3755cde5: am
dce8f102: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
* commit '
3755cde5fd20306f3965e7b317e3763640b11b42':
Change pairing api/intent permission from PRIVILEGED to ADMIN
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:54:12 +0000 (14:54 -0700)]
am
a58a4068: am
311fd8bf: Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345
* commit '
a58a4068a42d9b705a2501559c0e8600306ad573':
Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345
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:56:28 +0000 (17:56 -0700)]
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:56:18 +0000 (15:56 -0700)]
am
1d8e1090: am
98df3e8f: Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app
* commit '
1d8e1090e1e19520749d906701c1aa27dac41a61':
Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app
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:12:07 +0000 (13:12 -0700)]
am
c5253c9d: am
c3cbf72f: Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
* commit '
c5253c9d5c66330ea3de51b7232eecb13738f151':
Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
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:49:39 +0000 (17:49 -0700)]
am
2d4b7b73: am
c14e9468: Merge "Remove MMS support from MAP profile" into klp-dev
* commit '
2d4b7b7362036e7f864b1d9eeb39d671359e9f7b':
Remove MMS support from MAP profile
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:58:15 +0000 (15:58 -0700)]
am
ff7dc101: am
205b3775: merge in KQS81M
* commit '
ff7dc1010bd9c38c5b3348ed15d8deda62e13604':
Add MEDIA_CONTENT_CONTROL permission
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:10:20 +0000 (10:10 -0700)]
am
d2b8377f: am
ce827197: Merge "Update AVRCP implementation of IRemoteControlDisplay" into klp-dev
* commit '
d2b8377f82a65c76606acbd10802648a378bf673':
Update AVRCP implementation of IRemoteControlDisplay
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:24:28 +0000 (10:24 -0700)]
am
486e56ba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
486e56ba589fcb7884e66d13af4a18faae8e83ad':
Import translations. DO NOT MERGE
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:17:30 +0000 (10:17 -0700)]
am
6f54a553: (-s ours) am
5d00ba23: (-s ours) Import translations. DO NOT MERGE
* commit '
6f54a5532c43fefcf9b3458cf17a67f3a8f27106':
Import translations. DO NOT MERGE
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 [Tue, 1 Oct 2013 12:26:05 +0000 (05:26 -0700)]
am
cbfd9612: Merge "Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED" into klp-dev
* commit '
cbfd961209f35c5183a9dc7ee5d34954e6e32d6e':
Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED
Zhihai Xu [Tue, 1 Oct 2013 00:06:20 +0000 (17:06 -0700)]
am
db72c920: Merge "Unable to receive Text Message to CAR Kit(nuvi3580LM)" into klp-dev
* commit '
db72c9202b6309104b231d166c51c1f7ceca3efa':
Unable to receive Text Message to CAR Kit(nuvi3580LM)
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
Matthew Xie [Thu, 26 Sep 2013 23:21:26 +0000 (16:21 -0700)]
am
8cce6da9: Merge "AtPhonebook handleCpbsCommand was incorrectly sending two responses to some requests (one inside the swtich statement, then repeating it after breaking out of the switch statement). This broke phonebook sync with Audi 2G MMI car kit. Signed-off-by:
* commit '
8cce6da9099e72000182d1406e7238b8f697ef13':
AtPhonebook handleCpbsCommand was incorrectly sending two responses to some requests (one inside the swtich statement, then repeating it after breaking out of the switch statement). This broke phonebook sync with Audi 2G MMI car kit. Signed-off-by: Nigel Hannam <nigel@hannam.eu>
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
Matthew Xie [Thu, 26 Sep 2013 23:15:53 +0000 (23:15 +0000)]
Merge "AtPhonebook handleCpbsCommand was incorrectly sending two responses to some requests (one inside the swtich statement, then repeating it after breaking out of the switch statement). This broke phonebook sync with Audi 2G MMI car kit. Signed-off-by: Nigel Hannam <nigel@hannam.eu>"
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 22:02:19 +0000 (15:02 -0700)]
am
17a2c2c2: Merge "bluetooth crash caused by read phone book with invalid colummn number -1" into klp-dev
* commit '
17a2c2c2245ea7275c2380f352aaea22450585af':
bluetooth crash caused by read phone book with invalid colummn number -1
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 16:19:36 +0000 (09:19 -0700)]
am
b3082d83: (-s ours) Import translations. DO NOT MERGE
* commit '
b3082d834a8fa65038e8ebdeff16cf0394bfb82c':
Import translations. DO NOT MERGE
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:59:36 +0000 (13:59 -0700)]
am
107aa9c1: Merge "resource leakage in bluetooth MAP when empty message in phone." into klp-dev
* commit '
107aa9c1c7928ff499a7147699b86920262e1562':
resource leakage in bluetooth MAP when empty message in phone.
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:33:40 +0000 (10:33 -0700)]
am
788788cc: Merge "Check null condition of number before contact query" into klp-dev
* commit '
788788cc4a56eed314675314447c2ce240417233':
Check null condition of number before contact query
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
Jean-Michel Trivi [Fri, 20 Sep 2013 00:34:12 +0000 (17:34 -0700)]
am
5509d363: Add MEDIA_CONTENT_CONTROL permission
* commit '
5509d363f16f82c3fd56ee532e6de166cfd31d2c':
Add MEDIA_CONTENT_CONTROL permission
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 [Tue, 17 Sep 2013 23:53:10 +0000 (16:53 -0700)]
am
2e90040f: Change Volume step scale. Use setStreamVolume instead of avrcpUpdateVolume
* commit '
2e90040ffc6f1c4cd5187338c9f708df4d380aee':
Change Volume step scale. Use setStreamVolume instead of avrcpUpdateVolume
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:54:26 +0000 (19:54 -0700)]
am
bae1f268: (-s ours) Import translations. DO NOT MERGE
* commit '
bae1f2683e6829767ee36c17bf1d4196e8ebeae1':
Import translations. DO NOT MERGE