OSDN Git Service

android-x86/packages-apps-Bluetooth.git
10 years agoam 5d77afc4: am f0e15e66: am 3f298ffe: am e9428c35: am 7677468e: am 884362fe: am...
Daniel Cashman [Wed, 15 Jan 2014 20:09:25 +0000 (20:09 +0000)]
am 5d77afc4: am f0e15e66: am 3f298ffe: am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '5d77afc4f37931d05489d64f4f0fdffd7dc13336':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam f0e15e66: am 3f298ffe: am e9428c35: am 7677468e: am 884362fe: am ada9e950: am...
Daniel Cashman [Wed, 15 Jan 2014 20:06:18 +0000 (12:06 -0800)]
am f0e15e66: am 3f298ffe: am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit 'f0e15e6669ccfc319cfe943da0697808347951eb':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 3f298ffe: am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge...
Daniel Cashman [Wed, 15 Jan 2014 20:03:01 +0000 (12:03 -0800)]
am 3f298ffe: am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '3f298ffe0add6b60e8d6265670928f84ce7d7338':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefi...
Daniel Cashman [Wed, 15 Jan 2014 20:00:01 +0000 (12:00 -0800)]
am e9428c35: am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit 'e9428c35344af989f9e643964a81e2dc0ce1ffe1':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter...
Daniel Cashman [Wed, 15 Jan 2014 19:57:08 +0000 (11:57 -0800)]
am 7677468e: am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '7677468ea5a2a71780e8bcf69a97c939b2ebc39b':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path...
Daniel Cashman [Wed, 15 Jan 2014 19:47:54 +0000 (11:47 -0800)]
am 884362fe: am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '884362fee9df9f2c61d61bc0926033de82e58f14':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp...
Daniel Cashman [Wed, 15 Jan 2014 19:21:11 +0000 (11:21 -0800)]
am ada9e950: am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit 'ada9e95000f65d4ad7e5c697d48c76e6b9e54cf0':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into...
Daniel Cashman [Wed, 15 Jan 2014 19:10:48 +0000 (11:10 -0800)]
am 727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

* commit '727741cd610b35e675e7b7769ddf431e5763344d':
  Use pathPrefix filter instead of path for /btopp content

10 years agoMerge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
Daniel Cashman [Wed, 15 Jan 2014 19:07:18 +0000 (19:07 +0000)]
Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev

10 years agoam b65d4111: am 6448d8a5: am 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am...
Matthew Xie [Mon, 13 Jan 2014 21:10:09 +0000 (21:10 +0000)]
am b65d4111: am 6448d8a5: am 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'b65d4111f2d3fdc0a0e6c852d90e7e7c764e562c':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 6448d8a5: am 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am...
Matthew Xie [Mon, 13 Jan 2014 21:07:16 +0000 (13:07 -0800)]
am 6448d8a5: am 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit '6448d8a59ff9cc765a2d9749683861312d95c3fa':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am...
Matthew Xie [Mon, 13 Jan 2014 21:03:16 +0000 (13:03 -0800)]
am 2a294154: am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit '2a2941544f04af1e70f9be8cd6a62de6d545eaae':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am...
Matthew Xie [Mon, 13 Jan 2014 21:00:08 +0000 (13:00 -0800)]
am c4d45b2f: am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'c4d45b2f898d77b61f8614e22645bfb8ecd00930':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use...
Matthew Xie [Mon, 13 Jan 2014 20:57:04 +0000 (12:57 -0800)]
am e6643ed4: am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'e6643ed4cbe6d5ebe4f1a4979a78f81f6aeff1f0':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filte...
Matthew Xie [Mon, 13 Jan 2014 20:50:14 +0000 (12:50 -0800)]
am 12533801: am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit '125338015bd96550c2d15d87a506640499820885':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead...
Matthew Xie [Mon, 13 Jan 2014 20:47:18 +0000 (12:47 -0800)]
am 8e13dea5: am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit '8e13dea5f919737738db6e38c56cc83f43a7d555':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for...
Matthew Xie [Mon, 13 Jan 2014 20:38:07 +0000 (12:38 -0800)]
am fdcf4028: am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'fdcf402834c3f108a085a9c9b2f3be4848174f3b':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 20:34:58 +0000 (12:34 -0800)]
am a162ec5d: am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'a162ec5d684e4bf3e14ef1ddbd4a910c82915b93':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 9700464a: am 1e5ea551: am 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filte...
Matthew Xie [Mon, 13 Jan 2014 19:02:21 +0000 (19:02 +0000)]
am 9700464a: am 1e5ea551: am 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit '9700464a2b6fbef825bc278e3ef1cdc6783a0c26':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 1e5ea551: am 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead...
Matthew Xie [Mon, 13 Jan 2014 18:58:46 +0000 (10:58 -0800)]
am 1e5ea551: am 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit '1e5ea5518f15533602a589d4c7c55f9e6e7b648b':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for...
Matthew Xie [Mon, 13 Jan 2014 18:56:40 +0000 (10:56 -0800)]
am 014f9993: am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit '014f99934e57207df0b68e2c7468b923dc6539d2':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 266dce78: am 4fd115eb: am 18c10a10: Merge "Use pathPrefix filter instead of path...
Daniel Cashman [Mon, 13 Jan 2014 18:53:44 +0000 (18:53 +0000)]
am 266dce78: am 4fd115eb: am 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev

* commit '266dce782c074bcb3541f3d43e4b61ab67138370':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 18:53:16 +0000 (10:53 -0800)]
am bf0aa27e: am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit 'bf0aa27ec7e106deb4fe61a10deebffcfe68b4bd':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 14b74c3c: Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 18:50:01 +0000 (10:50 -0800)]
am 14b74c3c: Use pathPrefix filter instead of path for /btopp content

* commit '14b74c3c20e06cb69b4b624c3ebb9b72bb14090d':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 4fd115eb: am 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp...
Daniel Cashman [Mon, 13 Jan 2014 18:49:31 +0000 (10:49 -0800)]
am 4fd115eb: am 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev

* commit '4fd115eb21291d301f51aaf6fe260c5e9eecb718':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into...
Daniel Cashman [Mon, 13 Jan 2014 18:46:17 +0000 (10:46 -0800)]
am 18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev

* commit '18c10a1061cf300ecdb73139f10b5092de0f3cb7':
  Use pathPrefix filter instead of path for /btopp content

10 years agoam deb7bdad: Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 18:45:58 +0000 (10:45 -0800)]
am deb7bdad: Use pathPrefix filter instead of path for /btopp content

* commit 'deb7bdad8cbe0501d414fdec698387714837f927':
  Use pathPrefix filter instead of path for /btopp content

10 years agoMerge "Use pathPrefix filter instead of path for /btopp content" into klp-dev
Daniel Cashman [Mon, 13 Jan 2014 18:43:30 +0000 (18:43 +0000)]
Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev

10 years agoam d4c5a505: (-s ours) am f12a0823: (-s ours) am ab233007: (-s ours) Import translati...
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

10 years agoam f12a0823: (-s ours) am ab233007: (-s ours) 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

10 years agoam ab233007: (-s ours) 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

10 years agoImport translations. DO NOT MERGE
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

10 years agoUse pathPrefix filter instead of path for /btopp content
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
Conflicts:
tests/AndroidManifest.xml

10 years agoUse pathPrefix filter instead of path for /btopp content
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
Conflicts:
tests/AndroidManifest.xml

10 years agoUse pathPrefix filter instead of path for /btopp content
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
Conflicts:
tests/AndroidManifest.xml

10 years agoUse pathPrefix filter instead of path for /btopp content
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

(cherry picked from commit 2819c1dbef39a712ab8adfcd36d2cb01f2379259)

Change-Id: I00b23e5c3a98422c2dd1cc220f2c121578ff5c8f

10 years agoam f43652de: am 025c8ec1: Merge "remove a read lock to work around a platform deadloc...
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.

10 years agoam 025c8ec1: Merge "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.

10 years agoMerge "remove a read lock to work around a platform deadlock problem." into klp-dev
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

10 years agoremove a read lock to work around a platform deadlock problem.
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

10 years agoam 2c41d997: am 3987efa9: Merge "LE: Fix stack crash on invalid descriptor write...
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

10 years agoam 3987efa9: Merge "LE: Fix stack crash on invalid descriptor write request" into...
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

10 years agoMerge "LE: Fix stack crash on invalid descriptor write request" into klp-dev
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

10 years agoLE: Fix stack crash on invalid descriptor write request
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

10 years agoam e56c70f6: am cd68000c: Merge "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

10 years agoam cd68000c: Merge "cancel device discovery before start pairing process" into klp-dev
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

10 years agoMerge "cancel device discovery before start pairing process" into klp-dev
Matthew Xie [Thu, 7 Nov 2013 05:49:26 +0000 (05:49 +0000)]
Merge "cancel device discovery before start pairing process" into klp-dev

10 years agocancel device discovery before start pairing process
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

10 years agoam 0b98b993: am 240e2c5c: Merge "FF/REW is not correctly for AVRCP." into klp-dev
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.

10 years agoam 240e2c5c: Merge "FF/REW is not correctly for AVRCP." into klp-dev
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.

10 years agoMerge "FF/REW is not correctly for AVRCP." into klp-dev
Zhihai Xu [Wed, 6 Nov 2013 00:15:52 +0000 (00:15 +0000)]
Merge "FF/REW is not correctly for AVRCP." into klp-dev

10 years agoam 981c0006: am dedebbfb: 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.

10 years agoam dedebbfb: 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.

10 years agoHandles 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

10 years agoam 5a35fc13: (-s ours) am 79098ae2: (-s ours) Import translations. DO NOT MERGE
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

10 years agoam 79098ae2: (-s ours) 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

10 years agoam 2665ad11: am 9dc561f7: Merge "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

10 years agoImport 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

10 years agoam 9dc561f7: Merge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev
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

10 years agoMerge "NPE in bluetooth MAP cause bluetooth process crash" into klp-dev
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

10 years agoFF/REW is not correctly for AVRCP.
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

10 years agoNPE in bluetooth MAP cause bluetooth process crash
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

10 years agoam 48892c8f: (-s ours) am 80be110d: (-s ours) Import translations. DO NOT MERGE
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

10 years agoam 80be110d: (-s ours) 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

10 years agoImport 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

10 years agoam d2e9f926: am 82492947: MAP: fix problem with MNS not disconnecting correctly
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

10 years agoam 82492947: 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

10 years agoMAP: 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

10 years agoam 3755cde5: am dce8f102: Merge "Change pairing api/intent permission from PRIVILEGED...
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

10 years agoam dce8f102: Merge "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

10 years agoMerge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
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

10 years agoChange pairing api/intent permission from PRIVILEGED to ADMIN
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

10 years agoam a58a4068: am 311fd8bf: Bluetooth Application Crash while try to pairing with lapto...
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

10 years agoam 311fd8bf: 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

10 years agoBluetooth 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

10 years agoam 587fa0b4: am 565caebc: merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:56:28 +0000 (17:56 -0700)]
am 587fa0b4: am 565caebc: merge in klp-release (no-op)

* commit '587fa0b43e4ccb2479003f54364ff75b7eab7c11':

10 years agoam 565caebc: merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:51:50 +0000 (17:51 -0700)]
am 565caebc: merge in klp-release (no-op)

* commit '565caebcfc6ba053bbd765cdc9da63b38530c22e':

10 years agomerge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:44:43 +0000 (17:44 -0700)]
merge in klp-release (no-op)

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 13 Oct 2013 13:02:15 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam 1d8e1090: am 98df3e8f: Fix for MAP/PBAP: Race-condition when requesting authorizat...
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

10 years agoam 98df3e8f: Fix for MAP/PBAP: Race-condition when requesting authorization from...
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

10 years agoFix 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

10 years agoam c5253c9d: am c3cbf72f: 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 .

10 years agoam c3cbf72f: 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 .

10 years agoAllows 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

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 10 Oct 2013 13:01:20 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam 2d4b7b73: am c14e9468: Merge "Remove MMS support from MAP profile" into 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

10 years agoam c14e9468: Merge "Remove MMS support from MAP profile" into 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

10 years agoMerge "Remove MMS support from MAP profile" into klp-dev
Zhihai Xu [Thu, 10 Oct 2013 00:44:36 +0000 (00:44 +0000)]
Merge "Remove MMS support from MAP profile" into klp-dev

10 years agoRemove MMS support from MAP profile
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

10 years agoam ff7dc101: am 205b3775: merge in KQS81M
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

10 years agoam 205b3775: merge in KQS81M
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

10 years agomerge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:42:05 +0000 (15:42 -0700)]
merge in KQS81M

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 8 Oct 2013 13:00:54 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam d2b8377f: am ce827197: Merge "Update AVRCP implementation of IRemoteControlDisplay...
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

10 years agoam ce827197: Merge "Update AVRCP implementation of IRemoteControlDisplay" into 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

10 years agoMerge "Update AVRCP implementation of IRemoteControlDisplay" into klp-dev
Jean-Michel Trivi [Mon, 7 Oct 2013 17:04:41 +0000 (17:04 +0000)]
Merge "Update AVRCP implementation of IRemoteControlDisplay" into klp-dev

10 years agomerge in klp-release history after reset to 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

10 years agoam 486e56ba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Fri, 4 Oct 2013 17:20:34 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev