OSDN Git Service
Selim Cinek [Thu, 28 Aug 2014 09:36:04 +0000 (09:36 +0000)]
Merge "Colored notifications" into lmp-dev
Matthew Xie [Thu, 28 Aug 2014 05:40:59 +0000 (05:40 +0000)]
Merge "Listen for phone state on connect instead of SLC" into lmp-dev
Selim Cinek [Wed, 27 Aug 2014 13:51:25 +0000 (15:51 +0200)]
Colored notifications
Bug:
17128331
Change-Id: Ic1a4d9803790cc0f3e8003ede4da8cc8f26729cf
Prerepa Viswanadham [Mon, 25 Aug 2014 21:27:15 +0000 (14:27 -0700)]
Set batch scan params based on scan settings.
bug
17134263
Change-Id: Id0d314ad1c14ad20e32830ae2c8ad5f80765b28b
Ravi Nagarajan [Fri, 19 Apr 2013 10:03:54 +0000 (03:03 -0700)]
Listen for phone state on connect instead of SLC
Phone state listener changed to start on connect. This gaurantees
that the CIND response as part of SLC reflects the right indicator
values
bug
17020870
Change-Id: I47989643600edfa4d4e422998c3a644a7f7556b9
Baligh Uddin [Mon, 25 Aug 2014 22:07:17 +0000 (22:07 +0000)]
am
28d13bff: (-s ours) am
bbea2cec: (-s ours) Import translations. DO NOT MERGE
* commit '
28d13bff5306fa45e41d7ea675aafe9e8a1113f4':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 25 Aug 2014 16:11:05 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Wei Wang [Sun, 24 Aug 2014 23:00:39 +0000 (23:00 +0000)]
Merge "Fix API council review comments. Also hide certain APIs(2/3)." into lmp-dev
Wei Wang [Sun, 24 Aug 2014 19:00:08 +0000 (19:00 +0000)]
Merge "Fix race condition when advertising app dies." into lmp-dev
Baligh Uddin [Sun, 24 Aug 2014 15:42:20 +0000 (08:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6029a797339c39be20b2f31c59fcfac91d1fbb4b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 22 Aug 2014 17:16:24 +0000 (17:16 +0000)]
am
bbea2cec: (-s ours) Import translations. DO NOT MERGE
* commit '
bbea2cec7b27babcd06dc8ade731978d19e79e7b':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Aug 2014 16:30:17 +0000 (09:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d26c9d88113963727edee77423cfbcd50742ce6
Auto-generated-cl: translation import
Andre Eisenbach [Thu, 21 Aug 2014 17:56:41 +0000 (17:56 +0000)]
Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev
Wei Wang [Tue, 12 Aug 2014 21:48:18 +0000 (14:48 -0700)]
Fix race condition when advertising app dies.
Bug:
16565960
Change-Id: Ica801a1186e62fcba666deabe5989dd47d404b68
Andre Eisenbach [Wed, 20 Aug 2014 01:01:08 +0000 (18:01 -0700)]
LE: Rename new MTU and connection paramter update APIs
bug
17005342
Change-Id: Ic773b5c4bb3da9777613c8094ad21ea6f720110d
Lorenzo Colitti [Tue, 12 Aug 2014 01:44:31 +0000 (10:44 +0900)]
Stop using LinkProperties for static configuration.
Bug:
16114392
Bug:
16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
Baligh Uddin [Sun, 17 Aug 2014 13:42:47 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sat, 16 Aug 2014 04:00:17 +0000 (04:00 +0000)]
am
b35d0599: (-s ours) am
2396c919: (-s ours) Import translations. DO NOT MERGE
* commit '
b35d0599bc5846886913147aff52ddd8ee6b05ff':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 16 Aug 2014 02:39:30 +0000 (19:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icaaa618e7c4b13fda5ff936aebfe02ee1e4f277c
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Aug 2014 22:20:00 +0000 (22:20 +0000)]
am
2396c919: (-s ours) Import translations. DO NOT MERGE
* commit '
2396c919e3eba633feb37a84bd195bfde5f48629':
Import translations. DO NOT MERGE
Wei Wang [Fri, 15 Aug 2014 21:02:45 +0000 (14:02 -0700)]
Fix API council review comments. Also hide certain APIs(2/3).
b/
17006825
Change-Id: I6c0e739e44f8a9d26f3f2b03937b38d4dec893e7
Baligh Uddin [Fri, 15 Aug 2014 19:20:32 +0000 (12:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3ca5afbffa0ddc43dde3bd614bb8e099550c086a
Auto-generated-cl: translation import
Wei Wang [Wed, 13 Aug 2014 05:41:28 +0000 (22:41 -0700)]
Add protection before cleaning up adv and scan manager.
b/
16845251
Apparently for GattService stop and cleanup could be called before start
is even called.
Change-Id: Id0ac2e68da504f79160264012a0cdf5127eccfc7
Wei Wang [Wed, 13 Aug 2014 05:03:34 +0000 (05:03 +0000)]
Merge "Use nanos instead of micros in BLE scan." into lmp-dev
Baligh Uddin [Mon, 11 Aug 2014 17:59:37 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I534010963a83e71abf460bdf8771c38dce895d8c
Auto-generated-cl: translation import
Wei Wang [Mon, 11 Aug 2014 17:42:10 +0000 (10:42 -0700)]
Use nanos instead of micros in BLE scan.
Change-Id: Ifdaf101f92ae4c8d2bcecf62a1942961d6610151
Wei Wang [Fri, 8 Aug 2014 02:32:04 +0000 (02:32 +0000)]
Merge "fix build." into lmp-dev
Wei Wang [Fri, 8 Aug 2014 01:28:52 +0000 (18:28 -0700)]
fix build.
Change-Id: I034cc118ea4dca67ed6240b700d4ac504562ddfc
Wei Wang [Thu, 7 Aug 2014 21:01:18 +0000 (14:01 -0700)]
Fix build.
Change-Id: Ied3bd289b662cd342ba05f5038175007d3211a63
Prerepa Viswanadham [Thu, 7 Aug 2014 19:36:51 +0000 (12:36 -0700)]
OnFound/Lost reporting: s/w detects the first match and
hw signal is used to report onlost.
Bug
16733710
Change-Id: I4d1d0320b6894fe1af59192eb56a4a801609049a
Andre Eisenbach [Fri, 8 Aug 2014 02:29:37 +0000 (02:29 +0000)]
Merge "LE: Add limited advertising duration capability (3/3)" into lmp-dev
Andre Eisenbach [Thu, 7 Aug 2014 22:19:45 +0000 (15:19 -0700)]
LE: Add limited advertising duration capability (3/3)
Change-Id: Ib025d8a10cce07e8f731c005d963245aa988be73
Wei Wang [Thu, 7 Aug 2014 18:47:17 +0000 (18:47 +0000)]
Merge "Clear pending data and allow all filter when batch stopped." into lmp-dev
Wei Wang [Tue, 5 Aug 2014 06:17:29 +0000 (23:17 -0700)]
Clear pending data and allow all filter when batch stopped.
Also send batch data to multiple clients for full batch.
b/
16802098
Change-Id: Ife1723b818531fcf2cff897686f33f6b0a1d0aaa
Casper Bonde [Thu, 24 Jul 2014 11:47:23 +0000 (13:47 +0200)]
BT MAP: added support for email sharing over BT
- added support for Emails
- added activity to do setup of the email accounts to share
- added improved handling of MMS, SMS and Email
- Many optimizations to speed (especially getMessageListing)
- fixed wakelock problem
- fixed user timeout problem when user do not react to msg access request
- added missing privileges
- support for Quoted Printable format
- added accountId in test case URIs
- fixed problem with service numbers being strings
- fixed problem with read flag in getMessage
- added support for transparent flag in Email Push
- added missing send-event for non-imap accounts
- set attachment size to 0 if text-only message
- fixed double send for sms messages with retry
- removed secondary phone numbers from recipient/originator
- removed insert-address-token in MMS messages
- fixed null-pointer exception in settings (missing extra in intent)
- send text-only mms as sms (workaround to make it cheaper)
- fixed rejection of native and fraction requests
- better handling of unknown message types in push
- fixed problem with possible illigal xml chars in message listing
- added missing WRITE_APN_SETTINGS permission to manifest
- fixed problem with notifications when pushing to folders other than OUTBOX
- removed debugging code
- added support for threadId
- fixed permission problems
- changed to use ContentProviderClients for Email app access
- fixed names for member vars
UPDATE: Moved the MAP E-mail API to the bluetooth package.
UPDATE: Added check for the presense of MMS parts.
This is needed due to a change in the MMS app/subsystem,
where deleted messages gets corrupted.
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Change-Id: Ib5dbe7c2d5c0ba8d978ae843d840028592e3cab4
Wei Wang [Tue, 5 Aug 2014 04:08:34 +0000 (21:08 -0700)]
Workaround for reversed mac addresses in batch scan.
b/
16803363
Change-Id: I47299ed2a6191e7f05c229feb1f1f0424e486907
Andre Eisenbach [Tue, 5 Aug 2014 16:57:58 +0000 (16:57 +0000)]
Merge "Add transport parameter to createBond() function (3/4)" into lmp-dev
Andre Eisenbach [Tue, 5 Aug 2014 00:51:10 +0000 (17:51 -0700)]
Add transport parameter to createBond() function (3/4)
Change-Id: Id3c59bcc8f9efb20fffdebaff34d6b2593f5e5ca
Matthew Xie [Mon, 4 Aug 2014 17:40:24 +0000 (10:40 -0700)]
Check null mHandler condition before invoking method on it
There is a path that clean up is called before stop call on HealthService
mHandler could be set to null
bug
16784750
Change-Id: Ie931fa502cf82d21c6bf97a8dc7035e5a1ed4b2e
Nitin Srivastava [Wed, 30 Jul 2014 19:50:54 +0000 (01:20 +0530)]
MHF: Return the correct connection state for headset.
When more than 1 headset is connected, return the correct
connection state for a headset other than latest connected
headset.
bug
16514538
Change-Id: Id07165f2c023959b7a457a1c1c0ed5c227838973
Wei Wang [Sun, 3 Aug 2014 21:14:02 +0000 (14:14 -0700)]
Change discard rule.
Change-Id: Icfc43371acb0e901a7f67a4c32c5dd2e63de49c3
Wei Wang [Wed, 30 Jul 2014 04:38:29 +0000 (21:38 -0700)]
Add a default impelementation of IBluetoothGattCallback(2/2).
b/
16636127 Explicitly use UTF-8 for ScanRecord's local name
Change-Id: Ib152239cdee0becf3f49f1b610dfe1c2296c3647
Wei Wang [Fri, 1 Aug 2014 20:29:54 +0000 (20:29 +0000)]
Merge "Change service data and manufacturer data to be repeated." into lmp-dev
Wei Wang [Tue, 29 Jul 2014 23:15:44 +0000 (16:15 -0700)]
Change service data and manufacturer data to be repeated.
Change-Id: Ie45ca40d3d84d192d65003ea3ac9ad428b281f94
Yicheng Fan [Thu, 31 Jul 2014 21:43:31 +0000 (21:43 +0000)]
Merge "Remove client from advertiseManager correctly" into lmp-dev
Yicheng Fan [Thu, 31 Jul 2014 21:22:44 +0000 (14:22 -0700)]
Remove client from advertiseManager correctly
Bug:
16711409
Change-Id: I3881593818edcf822ec07353da4a5ea6970f5d7c
Prerepa Viswanadham [Thu, 31 Jul 2014 00:25:47 +0000 (17:25 -0700)]
Reduce batch supported threshold to 1024 bytes
b/
16680086
Change-Id: I671abd7dba321ab111280d1a1cb27aa93635a6d1
Prerepa Viswanadham [Wed, 30 Jul 2014 22:08:00 +0000 (15:08 -0700)]
Incorrect data type
bt_local_le_features_t of wrong size
b/
16653133
Change-Id: Ifade7add084fcfbef60abb7d8e5d47e619b0e812
Wei Wang [Tue, 29 Jul 2014 00:15:15 +0000 (00:15 +0000)]
Merge "Combine manu id and data before setting to stack." into lmp-dev
Prerepa Viswanadham [Mon, 28 Jul 2014 23:21:14 +0000 (16:21 -0700)]
Bug
16630976 - Fix for LE Scan not working
Change-Id: I287ff92b699bc798a7d208deed67bc4dce8e1af7
Wei Wang [Mon, 28 Jul 2014 07:09:09 +0000 (00:09 -0700)]
Fix build due to removal of configureScanParams.
Change-Id: If3458b47bb9dfc508e630fe1fb608f01c44284a9
Prerepa Viswanadham [Fri, 25 Jul 2014 23:25:13 +0000 (16:25 -0700)]
Refactor configuring scan params to scan manager
Change-Id: I8c60f0fa4307c2833bc5da6cd080515c5b16b652
Wei Wang [Sun, 27 Jul 2014 04:08:54 +0000 (21:08 -0700)]
Fix service data filter and report delay issue.
Change-Id: I1e4dd400c94f8740e4e950c42be6beac858f3ab8
Wei Wang [Sat, 26 Jul 2014 02:01:43 +0000 (19:01 -0700)]
Combine manu id and data before setting to stack.
Change-Id: Idef33daa87939a0533dae37dad53a827155d79ca
Wei Wang [Fri, 25 Jul 2014 06:44:50 +0000 (06:44 +0000)]
Merge "Use scanner for lagacy LE scan (2/2)." into lmp-dev
Andre Eisenbach [Thu, 24 Jul 2014 19:01:37 +0000 (12:01 -0700)]
Fix A2dp crash when re-starting Bluetooth services
When the Bluetooth process has died, the services will be restarted to
recover from a crash. This could cause an exception in the A2dp service
because the service maybe stopped without having successfully been
started before. Added null-check to prevent an exception during the
restart.
Bug:
16529242
Change-Id: I57c99ec72c0ba09c6c5325b262e83618aacb3e39
Wei Wang [Thu, 24 Jul 2014 06:32:09 +0000 (23:32 -0700)]
Use scanner for lagacy LE scan (2/2).
Change-Id: I273e7a2b6687f38d051c3264ff1bbb0025507820
Prerepa Viswanadham [Wed, 23 Jul 2014 00:31:11 +0000 (17:31 -0700)]
Bug
15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
Change-Id: Icff519c6e91d7a9a2fb5bd462daddb6a79f9bb46
Prerepa Viswanadham [Sat, 19 Jul 2014 04:30:20 +0000 (21:30 -0700)]
LE energy info feature
Java and JNI changes for energy info feature
Change-Id: Ifdc7b7253aea8c610b2dac90f2b3f525b5e2d73f
Wei Wang [Tue, 22 Jul 2014 19:01:40 +0000 (12:01 -0700)]
Add a ScanManager that handles Scan related operations. Remove
GattServiceStateMachine.
Change-Id: I03afefaa4ba534abbf8e2bd38b4888020764cb22
Baligh Uddin [Sun, 20 Jul 2014 02:24:45 +0000 (02:24 +0000)]
Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
Baligh Uddin [Sat, 19 Jul 2014 20:05:19 +0000 (13:05 -0700)]
Remove deprecated locales - DO NOT MERGE
Change-Id: I1ff0cda5206e98bfeae690e626e6daa01a8e70fc
Wei Wang [Sat, 19 Jul 2014 01:52:15 +0000 (18:52 -0700)]
Fix build
Change-Id: I0e4f8ffec53f606c75dbfae0db50da51118d8ddf
Wei Wang [Thu, 17 Jul 2014 05:17:36 +0000 (22:17 -0700)]
More API modification of BLE APIs (2/2)
Change-Id: I65085fa0fa5d02a9163f66555a1c7ba339b454af
Baligh Uddin [Sat, 19 Jul 2014 21:23:24 +0000 (21:23 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 17 Jul 2014 22:08:43 +0000 (15:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ddc5cb811f31657b93b2eb5cf59dca80fef8a7a
Auto-generated-cl: translation import
Andre Eisenbach [Fri, 18 Jul 2014 22:44:07 +0000 (22:44 +0000)]
Merge "Reduce GATT logging output" into lmp-dev
Andre Eisenbach [Fri, 18 Jul 2014 21:34:38 +0000 (14:34 -0700)]
Reduce GATT logging output
Change-Id: I85e9191065083f11056de44202a8e5a0cba1d2c8
Andre Eisenbach [Thu, 17 Jul 2014 06:01:53 +0000 (23:01 -0700)]
LE: Add connection parameter update request API (3/4)
Change-Id: I1be7d530d4db27473086ee8734cdb6aa5e63667c
Wei Wang [Fri, 18 Jul 2014 21:07:47 +0000 (21:07 +0000)]
Merge "Add an AdvertiseManager for LE advertise operations." into lmp-dev
Wei Wang [Wed, 16 Jul 2014 06:12:20 +0000 (23:12 -0700)]
Add an AdvertiseManager for LE advertise operations.
Move all advertise logic out of GattServiceStateMachine.
Change-Id: I9bc9be29372e79e863fc6a0b16d4808918bfb404
Baligh Uddin [Thu, 17 Jul 2014 00:11:00 +0000 (17:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e187a6ee17814be70ed1724219ec7a738a8c9d2
Auto-generated-cl: translation import
Sharvil Nanavati [Mon, 14 Jul 2014 21:54:34 +0000 (14:54 -0700)]
Fix bug b/
16119342 by synchronizing the access of mWakeLock in release().
Change-Id: Ie0fb5d2c5805f854a886729f539adf2ae865bc17
Wei Wang [Tue, 15 Jul 2014 18:06:36 +0000 (11:06 -0700)]
Add ALLOW_ALL filter logic to scan filters. Note filter index 1 is
reserved for ALLOW_ALL filter now.
Change-Id: Ie8b2f94a0112f95bc88323a8319f94fb780790a2
Wei Wang [Thu, 10 Jul 2014 22:40:28 +0000 (15:40 -0700)]
Remove MR2 BLE Advertising hidden API from L codebase (2/2)
Change-Id: I1430cef859544fc97b7c39ead42dcb184707aa5f
Matthew Xie [Sat, 12 Jul 2014 07:31:12 +0000 (07:31 +0000)]
am
24b52ce7: Merge "Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"" into klp-wireless-dev
* commit '
24b52ce786d8c5fa4bf1c4294ec9fbfd3738754f':
Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"
Matthew Xie [Sat, 12 Jul 2014 05:54:48 +0000 (05:54 +0000)]
am
c73bd48e: Merge "Bluetooth: MAP: Do not set body header if maxlist count is 0" into klp-wireless-dev
* commit '
c73bd48e5351a12103cb58a15fa9fc33825c9b07':
Bluetooth: MAP: Do not set body header if maxlist count is 0
Matthew Xie [Sat, 12 Jul 2014 05:54:47 +0000 (05:54 +0000)]
am
5693ce1f: Merge "Bluetooth-OPP: Avoid IndexOutOfBoundsException if share is zero" into klp-wireless-dev
* commit '
5693ce1fb60f7ebf858b4e35750a9335ebe47c72':
Bluetooth-OPP: Avoid IndexOutOfBoundsException if share is zero
Matthew Xie [Sat, 12 Jul 2014 05:54:46 +0000 (05:54 +0000)]
am
ead7ebb5: Merge "Bluetooth: Fix to avoid crash while sending deleted file" into klp-wireless-dev
* commit '
ead7ebb5ccb5bf81435437b4210a6e5413eb1c2f':
Bluetooth: Fix to avoid crash while sending deleted file
Andre Eisenbach [Fri, 11 Jul 2014 09:55:58 +0000 (02:55 -0700)]
Unhide Bluetooth batch APIs. Deprecate BluetoothAdpater scan APIs. (2/2)
Change-Id: If29034da523a4f2a0ce9807226363f038f0360cd
Matthew Xie [Sat, 12 Jul 2014 05:50:51 +0000 (05:50 +0000)]
Merge "Bluetooth: MAP: Do not set body header if maxlist count is 0" into klp-wireless-dev
Pradeep Panigrahi [Wed, 18 Dec 2013 14:09:04 +0000 (19:39 +0530)]
Bluetooth: MAP: Do not set body header if maxlist count is 0
As per MAP profile spec when message listing or folder
listing is done with 0 as max list count, then the response
should not contain the body header. Hence add change for the
same
Change-Id: I09b44a07bb9d15f248c0657563da4927ce4b4996
Matthew Xie [Sat, 12 Jul 2014 07:26:41 +0000 (07:26 +0000)]
Merge "Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"" into klp-wireless-dev
Matthew Xie [Sat, 12 Jul 2014 07:26:20 +0000 (07:26 +0000)]
Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"
This reverts commit
7f25f97c92b970ef5d58b36f963e7233efd5bf2a.
Change-Id: Ib07fd8439f07de8e6028e88eb0a9798c1aec61a0
Matthew Xie [Thu, 10 Jul 2014 18:14:05 +0000 (18:14 +0000)]
Merge "Bluetooth-OPP: Avoid IndexOutOfBoundsException if share is zero" into klp-wireless-dev
Matthew Xie [Thu, 10 Jul 2014 17:57:39 +0000 (17:57 +0000)]
Merge "Bluetooth: Fix to avoid crash while sending deleted file" into klp-wireless-dev
Nitin Shivpure [Fri, 6 Jun 2014 09:36:57 +0000 (15:06 +0530)]
Bluetooth: Fix to avoid crash while sending deleted file
A case where DUT send a file "A" to remote device from
download app(which was already deleted it in file explorer app)
via bluetooth, file sharing is unsuccessful. Now slide down the
status bar, Press bluetooth share item, enter to outbound
transfers screen & Press the "Try again" for file "A" on
file transfer pop-up box. Bluetooth share application is crashed
due to security exception, because it does not have following
permission android.permission.MANAGE_DOCUMENTS. So Adding
android.permission.MANAGE_DOCUMENTS permission to solve this
issue.
Change-Id: I1fea7c359edabf0e653a6afbd8fc864cd65c9663
Wei Wang [Thu, 10 Jul 2014 02:37:21 +0000 (19:37 -0700)]
Fix filter index stack initialization issue caused by GattServiceStateMachine created before adapter property is filled.
Change-Id: I4f487378b332d3b33c8646fd78d9ccec41431975
Prerepa Viswanadham [Wed, 9 Jul 2014 00:03:25 +0000 (17:03 -0700)]
OnFound and Onlost found integration
Change-Id: Ia7bdcd180a318844ab390e23a1f61168e79c324b
Juffin Alex Varghese [Tue, 4 Mar 2014 08:38:37 +0000 (14:08 +0530)]
Bluetooth-OPP: Avoid IndexOutOfBoundsException if share is zero
This change will avoid IndexOutOfBoundsException if number of sharing
files are zero. Otherwise, Bluetooth application will force close itself
when exception encountered.
Change-Id: I42473c8ca2d9116c6d57707ab8f3c452d7027e67
Wei Wang [Wed, 9 Jul 2014 04:27:20 +0000 (21:27 -0700)]
Fix a bug that swapped LOW_POWER AND LOW_LATENCY for advertising.
Change-Id: I21c95ef69c6f54f9d60395a9427d30b875e8e261
Matthew Xie [Wed, 9 Jul 2014 01:25:24 +0000 (01:25 +0000)]
Merge "resolved conflicts for merge of
dc497463 to master"
Matthew Xie [Wed, 9 Jul 2014 01:24:08 +0000 (18:24 -0700)]
resolved conflicts for merge of
dc497463 to master
Change-Id: I7bb1b91da3ae3b6e7e21b34a0cdfb5ed417135bc
Ang Li [Wed, 9 Jul 2014 00:40:46 +0000 (17:40 -0700)]
Make ACTION_CONNECTION_ACCESS_REQUEST to be sent in ordered fashion.
The purpose of this change is to enable automated testing
to confirm incoming connection without involving human.
Remove .setClass so the intent is no longer only sent to Settings.
This is ok because the intent is still hidden and protected.
Remove unused imports.
Change-Id: I3be5df4ab440b299a75ec41d566f9eecb0ab3f31
Matthew Xie [Tue, 8 Jul 2014 20:12:11 +0000 (20:12 +0000)]
am
7efa9db2: Merge "HFP: Fix missing OK for AT+CLCC in virtual call"
* commit '
7efa9db2129c99475684a2e44c4fb89cce3134bc':
HFP: Fix missing OK for AT+CLCC in virtual call
Dmitry Grinberg [Mon, 7 Jul 2014 19:50:54 +0000 (19:50 +0000)]
am
ddfaa805: DO NOT MERGE: Fix concurrency issues with wakelock support
* commit '
ddfaa805da01f2d543430c6ed15ce02a3f9d0160':
DO NOT MERGE: Fix concurrency issues with wakelock support
Dmitry Grinberg [Fri, 13 Jun 2014 22:55:34 +0000 (15:55 -0700)]
DO NOT MERGE: Fix concurrency issues with wakelock support
Bluedroid seems to have paths through it that lead us to here in many
ways. Add a lock to prevent confusing ourselves.
Bug:
15532889
Change-Id: Idaa828d9c49fbca5d52bfeeb6e6109df20170e0b
Matthew Xie [Tue, 8 Jul 2014 20:05:17 +0000 (20:05 +0000)]
Merge "HFP: Fix missing OK for AT+CLCC in virtual call"
Baligh Uddin [Sun, 6 Jul 2014 19:36:33 +0000 (19:36 +0000)]
am
58adcf54: (-s ours) am
13ca31dc: (-s ours) am
d18a7b47: (-s ours) Import translations. DO NOT MERGE
* commit '
58adcf540f82e85e88248a3af71bc8cdf5a86efb':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 19:31:25 +0000 (19:31 +0000)]
am
13ca31dc: (-s ours) am
d18a7b47: (-s ours) Import translations. DO NOT MERGE
* commit '
13ca31dcf258d139fc514ee5b55194495d352b0d':
Import translations. DO NOT MERGE
OSDN Git Service
