OSDN Git Service
Zhihai Xu [Tue, 7 Jan 2014 21:30:42 +0000 (21:30 +0000)]
Merge " isA2dpPlaying() reports wrong playing state when suspended"
Zhihai Xu [Tue, 7 Jan 2014 19:29:21 +0000 (11:29 -0800)]
isA2dpPlaying() reports wrong playing state when suspended
bug:
12412483
Change-Id: I1cf209479581bf28fc1ebdc462f552b8ec270520
Baligh Uddin [Tue, 7 Jan 2014 00:40:32 +0000 (00:40 +0000)]
am
203abe3f: (-s ours) am
cdfbc2e8: (-s ours) am
d4c5a505: (-s ours) am
f12a0823: (-s ours) am
ab233007: (-s ours) Import translations. DO NOT MERGE
* commit '
203abe3f88fb7a8983566060bc179eaf90a2ccf1':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 00:36:52 +0000 (00:36 +0000)]
am
cdfbc2e8: (-s ours) am
d4c5a505: (-s ours) am
f12a0823: (-s ours) am
ab233007: (-s ours) Import translations. DO NOT MERGE
* commit '
cdfbc2e8c990933377ac907f2b44dd3bfae81fb7':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 00:33:30 +0000 (00:33 +0000)]
am
d4c5a505: (-s ours) am
f12a0823: (-s ours) am
ab233007: (-s ours) Import translations. DO NOT MERGE
* commit '
d4c5a50532e123de06bfb96d73e5e891a20da883':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 00:30:18 +0000 (16:30 -0800)]
am
f12a0823: (-s ours) am
ab233007: (-s ours) Import translations. DO NOT MERGE
* commit '
f12a0823d75bee975545575d96575bce849212f4':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Jan 2014 19:38:26 +0000 (11:38 -0800)]
am
ab233007: (-s ours) Import translations. DO NOT MERGE
* commit '
ab2330077166c093123e09555c62836d979edf71':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Jan 2014 18:14:11 +0000 (10:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: If12dea506e2965a4a0cf7ceb5ce61236aba88de2
Auto-generated-cl: translation import
Baligh Uddin [Mon, 6 Jan 2014 18:13:09 +0000 (10:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8452ddf1d6c278a8c0e8de1f501f000d5bcc8525
Auto-generated-cl: translation import
Wei Wang [Wed, 30 Oct 2013 04:20:05 +0000 (21:20 -0700)]
BLE peripheral mode (2/4): Gatt Service Change.
Change-Id: I0ea7df8c159ad388d8e58768c49e785e9a4694bb
Zhihai Xu [Wed, 18 Dec 2013 18:42:29 +0000 (18:42 +0000)]
Merge "Device cannot go to sleep while connected to HBM-570 BT headset"
Zhihai Xu [Wed, 18 Dec 2013 18:32:30 +0000 (18:32 +0000)]
Merge "release wakelock if no activity in Bluetooth MAP profile to avoid waste power."
Zhihai Xu [Tue, 17 Dec 2013 17:42:58 +0000 (09:42 -0800)]
MAP: make MMS parsing more robust
Some devices are not following the specs correctly and send plan-text as MMS without the right headers.
This patch makes the MMS parser more robust against faulty MMS messages.
Bug:
11161383
Change-Id: Ib891f3cdc810d32082b3afe93ca18df4fcbff1be
Zhihai Xu [Mon, 14 Oct 2013 19:16:39 +0000 (12:16 -0700)]
Device cannot go to sleep while connected to HBM-570 BT headset
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
Zhihai Xu [Wed, 27 Nov 2013 07:09:54 +0000 (23:09 -0800)]
release wakelock if no activity in Bluetooth MAP profile to avoid waste power.
bug:
11138488
Change-Id: Ie7d8903cc917aee51711fa47f275863e4046f3d8
Kim Schulz [Thu, 10 Oct 2013 08:44:31 +0000 (10:44 +0200)]
MAP: make MMS parsing more robust
Some devices are not following the specs correctly and send plan-text as MMS without the right headers.
This patch makes the MMS parser more robust against faulty MMS messages.
Bug:
11161383
Change-Id: If5e59f9daaab4537cfe5d06e6203ae783e311fd3
Qiwen Zhao [Tue, 10 Dec 2013 18:47:18 +0000 (18:47 +0000)]
am
bd4c3197: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '
bd4c319790b5ac7be6694afd6ec9f9303acb0638':
Baligh Uddin [Mon, 9 Dec 2013 21:55:13 +0000 (13:55 -0800)]
Remove deprecated locales
Bug:
11340849
Change-Id: Ie17a9bcb48d08282e25e27265307ffc013b677f2
Qiwen Zhao [Mon, 9 Dec 2013 22:19:56 +0000 (14:19 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev
Matthew Xie [Fri, 6 Dec 2013 20:19:36 +0000 (12:19 -0800)]
Use pathPrefix filter instead of path for /btopp content
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
kschulz [Fri, 11 Oct 2013 13:13:25 +0000 (15:13 +0200)]
MAP: fixed missing filtering on Priority
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
Baligh Uddin [Thu, 5 Dec 2013 22:52:24 +0000 (22:52 +0000)]
am
b5d25aca: (-s ours) am
0dac1504: (-s ours) am
e76ce140: (-s ours) Import translations. DO NOT MERGE
* commit '
b5d25aca5721ddade8a32a4d2d7fe57d2f81988f':
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':
Matthew Xie [Fri, 22 Nov 2013 01:21:10 +0000 (01:21 +0000)]
Merge "enable xml format to transfer/receive over bluetooth"
Zhihai Xu [Fri, 15 Nov 2013 22:45:03 +0000 (14:45 -0800)]
am
322480a0: am
f43652de: am
025c8ec1: Merge "remove a read lock to work around a platform deadlock problem." into klp-dev
* commit '
322480a097a098ac39dd148e8aecc1106d5a3a88':
remove a read lock to work around a platform deadlock problem.
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 [Fri, 8 Nov 2013 00:13:07 +0000 (16:13 -0800)]
am
60bfce5d: am
2c41d997: am
3987efa9: Merge "LE: Fix stack crash on invalid descriptor write request" into klp-dev
* commit '
60bfce5dd906c5ba0f6f6908fb408f839d67d82a':
LE: Fix stack crash on invalid descriptor write request
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:56:04 +0000 (21:56 -0800)]
am
ee6898a4: am
e56c70f6: am
cd68000c: Merge "cancel device discovery before start pairing process" into klp-dev
* commit '
ee6898a4b73d90ebe20bc0218a707d3dc7d6e641':
cancel device discovery before start pairing process
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:52:01 +0000 (16:52 -0800)]
am
2a963d9c: am
0b98b993: am
240e2c5c: Merge "FF/REW is not correctly for AVRCP." into klp-dev
* commit '
2a963d9c3c34fa5af76b629160008838317bbb1a':
FF/REW is not correctly for AVRCP.
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:53:27 +0000 (15:53 -0800)]
am
7d4c28ea: am
981c0006: am
dedebbfb: Handles AT+BVRA=1 received during an open SCO session.
* commit '
7d4c28ea6a75cf71a6dbb3401bef6982258461c1':
Handles AT+BVRA=1 received during an open SCO session.
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.
Baligh Uddin [Tue, 5 Nov 2013 22:23:22 +0000 (14:23 -0800)]
am
4b6913e9: (-s ours) am
5a35fc13: (-s ours) am
79098ae2: (-s ours) Import translations. DO NOT MERGE
* commit '
4b6913e901a290c7271a517489e657b7a2f30729':
Import translations. DO NOT MERGE
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
Baligh Uddin [Tue, 5 Nov 2013 15:49:27 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE"
Zhihai Xu [Tue, 5 Nov 2013 06:00:45 +0000 (22:00 -0800)]
am
4945ac80: am
2665ad11: am
9dc561f7: Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev
* commit '
4945ac8099eb35112307f94c7c5ea7513f657fd3':
NPE in bluetooth MAP cause bluetooth process crash
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:53 +0000 (08:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0c5045887f4ee93c84f18d682a2ee7dde3b53645
Auto-generated-cl: translation import
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 [Wed, 30 Oct 2013 14:34:10 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib31d8386e34ca0e2d42505148536e4c4b9bc0718
Auto-generated-cl: translation import
Baligh Uddin [Mon, 28 Oct 2013 19:39:05 +0000 (12:39 -0700)]
am
082a5ae1: (-s ours) am
48892c8f: (-s ours) am
80be110d: (-s ours) Import translations. DO NOT MERGE
* commit '
082a5ae1ac876f79c8bb7f5c96534b9e5df94a9d':
Import translations. DO NOT MERGE
Zhihai Xu [Mon, 28 Oct 2013 19:39:05 +0000 (12:39 -0700)]
am
29189533: am
d2e9f926: am
82492947: MAP: fix problem with MNS not disconnecting correctly
* commit '
2918953346cad7a847f6f17f5934c72256c0bf49':
MAP: fix problem with MNS not disconnecting correctly
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
Baligh Uddin [Tue, 22 Oct 2013 19:46:49 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Matthew Xie [Mon, 21 Oct 2013 23:11:04 +0000 (16:11 -0700)]
am
50f08db8: am
3755cde5: am
dce8f102: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
* commit '
50f08db8a9100b79d7284406eaf2daae3af6a371':
Change pairing api/intent permission from PRIVILEGED to ADMIN
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
Baligh Uddin [Mon, 21 Oct 2013 15:05:10 +0000 (08:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id50e8e0a898506fe0ff44f4dc5e82953067619f3
Auto-generated-cl: translation import
Zhihai Xu [Fri, 18 Oct 2013 21:56:38 +0000 (14:56 -0700)]
am
1763de2c: am
a58a4068: am
311fd8bf: Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345
* commit '
1763de2c204a587dcfc04fa4324e415dd070139a':
Bluetooth Application Crash while try to pairing with laptop - IKDVXPSE-345
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 01:01:57 +0000 (18:01 -0700)]
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)
Casper Bonde [Mon, 14 Oct 2013 17:48:46 +0000 (10:48 -0700)]
am
ded8689b: am
1d8e1090: am
98df3e8f: Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app
* commit '
ded8689b33b1f345aafeea82b972c8b8cfab09cf':
Fix for MAP/PBAP: Race-condition when requesting authorization from Settings app
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:15:10 +0000 (13:15 -0700)]
am
9b2fbb84: am
c5253c9d: am
c3cbf72f: Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
* commit '
9b2fbb84ec3d673e337d9bf2927056077739e2f0':
Allows another GMS core app to handle ACTION_PAIRING_REQUEST .
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 01:02:04 +0000 (18:02 -0700)]
am
fd0c296a: am
2d4b7b73: am
c14e9468: Merge "Remove MMS support from MAP profile" into klp-dev
* commit '
fd0c296a9f6bf6a85acb8597ef480ce21154d40f':
Remove MMS support from MAP profile
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 [Wed, 9 Oct 2013 16:12:39 +0000 (09:12 -0700)]
am
870a6a54: am
ff7dc101: am
205b3775: merge in KQS81M
* commit '
870a6a5427f4a23d6fe5bd3ac9bb49d82c86e9c7':
Add MEDIA_CONTENT_CONTROL permission
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