OSDN Git Service

android-x86/packages-apps-Bluetooth.git
8 years agoDon't use SMS database until after the phone is unlocked
Ajay Panicker [Thu, 21 Jul 2016 17:39:14 +0000 (10:39 -0700)]
Don't use SMS database until after the phone is unlocked

When the device is encrypted and a passcode is set,
the SMS database isn't available and the MAP service
crashes when trying to access it. The service will now
respond with OBEX_SERVICE_UNAVAILABLE until the phone
is unlocked. At this point, the SMS database will
notify the content observer that all the messages are
available, and send corresponding events.

Bug: 29990836
Change-Id: I53f12d0e114212d94f16b56df7c7dbe73f6254df
(cherry picked from commit db8d8ae565b3db6a5e3187170dcb7b281a79f9da)
Merged-In: I53f12d0e114212d94f16b56df7c7dbe73f6254df

8 years agoMerge "Set the Adapter Service onCreate()"
Treehugger Robot [Thu, 25 Aug 2016 21:33:02 +0000 (21:33 +0000)]
Merge "Set the Adapter Service onCreate()"

8 years agoSet the Adapter Service onCreate()
Pavlin Radoslavov [Sat, 25 Jun 2016 00:31:52 +0000 (17:31 -0700)]
Set the Adapter Service onCreate()

We should call setAdapterService(this) inside onCreate() instead of
inside BleOnProcessStart(). The former is more robust.

Change-Id: Ide1d98dfdde148645f3efe246e6fbf95659195a7
(cherry picked from commit 39d7556b76036e02b87a6c4288a9a090e2bd6686)

8 years agoMerge "Allocate CallbacksObj Before Initializing A2DP JNI Interface"
Andre Eisenbach [Wed, 24 Aug 2016 00:46:52 +0000 (00:46 +0000)]
Merge "Allocate CallbacksObj Before Initializing A2DP JNI Interface"
am: b1b9ae5d4b

Change-Id: I2f4cb3851fd7941bb4192aa6eded60403d67201d

8 years agoMerge "Allocate CallbacksObj Before Initializing A2DP JNI Interface"
Andre Eisenbach [Wed, 24 Aug 2016 00:35:31 +0000 (00:35 +0000)]
Merge "Allocate CallbacksObj Before Initializing A2DP JNI Interface"

8 years agoAllocate CallbacksObj Before Initializing A2DP JNI Interface
Nathan Harold [Tue, 23 Aug 2016 22:23:33 +0000 (15:23 -0700)]
Allocate CallbacksObj Before Initializing A2DP JNI Interface

Bug: 31016704
Change-Id: If3dd4fdbc92e1420bc60910c39771aa549ac5dab

8 years agoMerge changes from topic 'ble-scan-accounting'
Jakub Pawlowski [Tue, 23 Aug 2016 21:51:39 +0000 (21:51 +0000)]
Merge changes from topic 'ble-scan-accounting'
am: 725d2dac7b  -s ours

Change-Id: Ic992092816435f0b1b24c762abd06722e32b7c58

8 years agoMerge changes from topic 'ble-scan-accounting'
Jakub Pawlowski [Tue, 23 Aug 2016 21:07:32 +0000 (21:07 +0000)]
Merge changes from topic 'ble-scan-accounting'

* changes:
  Reset ble scans in BatteryStats on start up
  Use the incoming WorkSource to notify batterystats of BLE scans

8 years agoMerge "Fix a deadlock in service discovery callbacks"
Jakub Pawlowski [Mon, 22 Aug 2016 21:38:36 +0000 (21:38 +0000)]
Merge "Fix a deadlock in service discovery callbacks"
am: 6fcd0081eb

Change-Id: I6e343bbc3ef5c54e372687ee989e1baa133a01c8

8 years agoMerge "Fix a deadlock in service discovery callbacks"
Treehugger Robot [Mon, 22 Aug 2016 21:22:21 +0000 (21:22 +0000)]
Merge "Fix a deadlock in service discovery callbacks"

8 years agoReset ble scans in BatteryStats on start up
Adam Lesinski [Mon, 22 Aug 2016 18:49:51 +0000 (11:49 -0700)]
Reset ble scans in BatteryStats on start up

Bug:22718669
Change-Id: Id31431bf35db3a52c8f1af1f210247d7ea20f6ed

8 years agoUse the incoming WorkSource to notify batterystats of BLE scans
Adam Lesinski [Mon, 22 Aug 2016 18:26:16 +0000 (11:26 -0700)]
Use the incoming WorkSource to notify batterystats of BLE scans

BatteryStats is going to start tracking bluetooth scanning, so
we start by passing along the WorkSource we were given (or we created
if none was specified).

This is only done for BLE scanning at the moment, and only for regular scans.
Batched scans will also need to be considered.

Bug:22718669
Change-Id: I15dd7c912320552323aaf9d713b4bb3224ffffec

8 years agoFix a deadlock in service discovery callbacks
Jakub Pawlowski [Fri, 19 Aug 2016 11:08:18 +0000 (04:08 -0700)]
Fix a deadlock in service discovery callbacks

onSearchCompleted calling gattClientGetGattDbNative directly, might
cause deadlock if the jni_workqueue is full.

Bug: 30835367
Change-Id: I05de735aa189dd2d250f2c5816d38c2ddcabb864

8 years agoMerge "Fix NPE in permissionCheck"
Jakub Pawlowski [Thu, 18 Aug 2016 01:39:29 +0000 (01:39 +0000)]
Merge "Fix NPE in permissionCheck"
am: 64ed2357e3

Change-Id: Ief4258ed339822801b97c9a85309608d59e98286

8 years agoMerge "Fix NPE in permissionCheck"
Treehugger Robot [Thu, 18 Aug 2016 01:37:50 +0000 (01:37 +0000)]
Merge "Fix NPE in permissionCheck"

8 years agoFix NPE in permissionCheck
Jakub Pawlowski [Thu, 18 Aug 2016 00:00:02 +0000 (17:00 -0700)]
Fix NPE in permissionCheck

permissionCheck can throw NPE when notification is received before
GATT database is discovered. Assume that permission is granted when
receiving notifications for unknown characteristic.

Bug: 30853729
Change-Id: I02aab1197b036584b2021d76f290c2c57db24a19

8 years agoMerge "Add LE Secure Connection data parsing (2/4)"
Jakub Pawlowski [Thu, 11 Aug 2016 23:06:03 +0000 (23:06 +0000)]
Merge "Add LE Secure Connection data parsing (2/4)"
am: 29101f7fd4

Change-Id: I962b635c44d2573a62936ab58bf8577ef19000cc

8 years agoMerge "Add LE Secure Connection data parsing (2/4)"
Jakub Pawlowski [Thu, 11 Aug 2016 22:32:22 +0000 (22:32 +0000)]
Merge "Add LE Secure Connection data parsing (2/4)"

8 years agoAdd LE Secure Connection data parsing (2/4)
Jakub Pawlowski [Thu, 28 Jul 2016 12:19:11 +0000 (05:19 -0700)]
Add LE Secure Connection data parsing (2/4)

Bug: 30460956
Change-Id: Ie5c3ad96e7a834c9dc0a6791cf2cd24ecaeb927e

8 years agoMerge "Prevent LE scanning apps from being wrongflully downgraded to opportunistic"
Ajay Panicker [Wed, 10 Aug 2016 01:38:40 +0000 (01:38 +0000)]
Merge "Prevent LE scanning apps from being wrongflully downgraded to opportunistic"
am: c9db1189d8

Change-Id: I216d43f760661274145b7140efb68e5c01528073

8 years agoMerge "Prevent LE scanning apps from being wrongflully downgraded to opportunistic"
Treehugger Robot [Wed, 10 Aug 2016 01:27:38 +0000 (01:27 +0000)]
Merge "Prevent LE scanning apps from being wrongflully downgraded to opportunistic"

8 years agoPrevent LE scanning apps from being wrongflully downgraded to opportunistic
Ajay Panicker [Thu, 4 Aug 2016 02:18:50 +0000 (19:18 -0700)]
Prevent LE scanning apps from being wrongflully downgraded to opportunistic

Bug: 30648104
Change-Id: I9d749a20eefdbeb126fa25a425d636205a22b2ef
(cherry picked from commit a1c7315ed05df04599e7cdc5f4bcf7d3ec8d3392)

8 years agoMerge "Change URI accessed to properly update read status"
Andre Eisenbach [Tue, 9 Aug 2016 23:55:06 +0000 (23:55 +0000)]
Merge "Change URI accessed to properly update read status"
am: f337ee1fe0

Change-Id: Iad683df58a9067e275bc07c0701cce2dfb94fd83

8 years agoMerge "Protect against SecurityException generated by query"
Andre Eisenbach [Tue, 9 Aug 2016 23:55:04 +0000 (23:55 +0000)]
Merge "Protect against SecurityException generated by query"
am: 369f6662fa

Change-Id: I9e379db4c8d54a7733bba873da2cb6abc73493e6

8 years agoMerge "Change URI accessed to properly update read status"
Andre Eisenbach [Tue, 9 Aug 2016 23:50:36 +0000 (23:50 +0000)]
Merge "Change URI accessed to properly update read status"

8 years agoChange URI accessed to properly update read status
Ajay Panicker [Thu, 28 Jul 2016 00:18:35 +0000 (17:18 -0700)]
Change URI accessed to properly update read status

Bug: 28970262
Change-Id: I07d9ab24d10396baa4ddbfbdfad5b1eec1b8e9d5

8 years agoMerge "Protect against SecurityException generated by query"
Andre Eisenbach [Tue, 9 Aug 2016 23:48:42 +0000 (23:48 +0000)]
Merge "Protect against SecurityException generated by query"

8 years agoProtect against SecurityException generated by query
Ajay Panicker [Wed, 3 Aug 2016 01:53:00 +0000 (18:53 -0700)]
Protect against SecurityException generated by query

Bug: 30444661
Change-Id: I1d93645f1d4475cf603cda8bb28df0b960ccb445

8 years agoMerge "HFP 1.7 profile update (4/4)"
Mudumba Ananth [Thu, 4 Aug 2016 01:36:48 +0000 (01:36 +0000)]
Merge "HFP 1.7 profile update (4/4)"
am: 1b9d2081e0

Change-Id: Ib18e452187c7d673e8ae387da99bf9e6faf43bda

8 years agoMerge "HFP 1.7 profile update (4/4)"
Andre Eisenbach [Thu, 4 Aug 2016 01:06:51 +0000 (01:06 +0000)]
Merge "HFP 1.7 profile update (4/4)"

8 years agoHFP 1.7 profile update (4/4)
Mudumba Ananth [Mon, 29 Feb 2016 10:14:18 +0000 (02:14 -0800)]
HFP 1.7 profile update (4/4)

-> Added HF Indicator support.
-> Sent a Broadcast intent upon receiving AT + BIND and
   AT + BIEV Events with the required parameters
-> Support for sending +BIND response on indicator
   status change

Bug: 19983867
Change-Id: I2580fc771080f1bc92fc4ddd5ca7c7cb57773183
(cherry picked from commit 2ab50a41dac634a78cef60a419c3bcc848c1aa78)

8 years agoMerge "Remove write type from GATT descriptor writes (2/4)"
Jakub Pawlowski [Thu, 4 Aug 2016 00:01:49 +0000 (00:01 +0000)]
Merge "Remove write type from GATT descriptor writes (2/4)"
am: ddd61d3443

Change-Id: I08ecf740a524cb511d86aa771809ccbc4afbf57b

8 years agoMerge "Remove write type from GATT descriptor writes (2/4)"
Treehugger Robot [Wed, 3 Aug 2016 23:54:35 +0000 (23:54 +0000)]
Merge "Remove write type from GATT descriptor writes (2/4)"

8 years agoRemove write type from GATT descriptor writes (2/4)
Jakub Pawlowski [Thu, 31 Mar 2016 05:57:24 +0000 (22:57 -0700)]
Remove write type from GATT descriptor writes (2/4)

According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used used
for this sub-procedure".

Change-Id: I557a55d2ba8e998bce552e40ec7031d91bc82752

8 years agoMerge "Move file lookup to its own thread for beaming"
Ajay Panicker [Wed, 3 Aug 2016 18:29:11 +0000 (18:29 +0000)]
Merge "Move file lookup to its own thread for beaming"
am: 001643829c

Change-Id: I6849f122ad600984b8e99a38576343d67ae86033

8 years agoMerge "Move file lookup to its own thread for beaming"
Treehugger Robot [Wed, 3 Aug 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Move file lookup to its own thread for beaming"

8 years agoMove file lookup to its own thread for beaming
Ajay Panicker [Tue, 26 Jul 2016 18:54:21 +0000 (11:54 -0700)]
Move file lookup to its own thread for beaming

Bug: 28973021
Change-Id: I40f6d32ffadd58e60dbd1e44802a629b9fab64e4
(cherry picked from commit 9b6816400cbb35df12eaf5fd59d1996d3d0dad84)

8 years agoresolve merge conflicts of ebe5b95 to stage-aosp-master
Jakub Pawlowski [Wed, 3 Aug 2016 12:52:58 +0000 (05:52 -0700)]
resolve merge conflicts of ebe5b95 to stage-aosp-master

Change-Id: I8c9ef03ff5e26128c9c6d69635355c4637075a45

8 years agoMerge "GATT Server refactoring (3/4)"
Jakub Pawlowski [Wed, 3 Aug 2016 10:21:43 +0000 (10:21 +0000)]
Merge "GATT Server refactoring (3/4)"

8 years agoGATT Server refactoring (3/4)
Jakub Pawlowski [Fri, 1 Apr 2016 15:07:48 +0000 (08:07 -0700)]
GATT Server refactoring (3/4)

Bug: 27999121
Change-Id: I45fec0fa6d0e8e26e40e1856ba9fee6f7fbd4f7b

8 years agoMerge "RemoteDevices: Optimize adding new remote devices"
Myles Watson [Wed, 3 Aug 2016 00:13:49 +0000 (00:13 +0000)]
Merge "RemoteDevices: Optimize adding new remote devices"
am: 55e58872c3

Change-Id: I85799db7e1fd3069815254afd2d6ebb559894d5a

8 years agoMerge "RemoteDevices: Optimize adding new remote devices"
Treehugger Robot [Wed, 3 Aug 2016 00:05:54 +0000 (00:05 +0000)]
Merge "RemoteDevices: Optimize adding new remote devices"

8 years agoRemoteDevices: Optimize adding new remote devices
Myles Watson [Fri, 15 Jul 2016 00:43:11 +0000 (17:43 -0700)]
RemoteDevices: Optimize adding new remote devices

RemoteDevices keeps track of the Bluetooth devices which have been
seen since the Bluetooth stack was initialized.  Each time a remote
device is discovered, it is added to a hash map.  When the size of the
hash map grows beyond a few hundred devices, the performance degrades.

This patch:
 - creates the address string once per search
  reducing the average search time with 300 devices from ~20ms to ~1ms
 - uses the hash of the address string to search
  further reducing the time with 1200 devices from ~2ms to ~1ms

HashMap<BluetoothDevice, DeviceProperties> became
 HashMap<String, DeviceProperties>

mDevice now stores the BluetoothDevice in each instance of
DeviceProperties.

TEST: Used System.nanoTime() to measure the elapsed time of
      getDeviceProperties()

Change-Id: Id44886143fb2910955294341d4938d638c72f7f9
Signed-off-by: Myles Watson <mylesgw@google.com>
8 years agoMerge \"Fix bugs in play status and play pos notifications\"
Marie Janssen [Sat, 30 Jul 2016 06:36:19 +0000 (06:36 +0000)]
Merge \"Fix bugs in play status and play pos notifications\"
am: 764eb24d86

Change-Id: I6a5119996813069494b3c7ee666025474d1d9763

8 years agoMerge "Fix bugs in play status and play pos notifications"
Marie Janssen [Sat, 30 Jul 2016 00:03:53 +0000 (00:03 +0000)]
Merge "Fix bugs in play status and play pos notifications"

8 years agoFix bugs in play status and play pos notifications
Marie Janssen [Tue, 26 Jul 2016 23:23:54 +0000 (16:23 -0700)]
Fix bugs in play status and play pos notifications

Fix multiple issues with status notificatios:
  * Playback state was not being sent when state wasn't sent
    accompanying a metadata change
  * Play state was being sent without an update
  * Position was being sent without a change and with the wrong
    indicator
  * Position was not being scheduled for update when playing.
  * Position was being scheduled for update when paused / stopped.

Bug: 30459664
Bug: 29400658
Bug: 28639383
Change-Id: Ic550dcab0430be45187b0267cc77875740388a2a

8 years agoMerge \"Add foreground flag to AG_CALL_CHANGED broadcast intent.\"
Lianchao Song [Tue, 19 Jul 2016 16:44:21 +0000 (16:44 +0000)]
Merge \"Add foreground flag to AG_CALL_CHANGED broadcast intent.\"
am: df005bf244

Change-Id: I0c8d2337e82c472fe4bd07d90f61c8b39e56dd80

8 years agoMerge "Add foreground flag to AG_CALL_CHANGED broadcast intent."
Chenjie Luo [Tue, 19 Jul 2016 16:38:19 +0000 (16:38 +0000)]
Merge "Add foreground flag to AG_CALL_CHANGED broadcast intent."

8 years agoMerge \"MAP: Remove redundant call to sendShutdownMessage to prevent crash\"
Hemant Gupta [Fri, 15 Jul 2016 17:10:57 +0000 (17:10 +0000)]
Merge \"MAP: Remove redundant call to sendShutdownMessage to prevent crash\"
am: 0786878b88

Change-Id: Ic62f273f84ae4b6b3c4d63ae089511b19723c1e4

8 years agoMerge "MAP: Remove redundant call to sendShutdownMessage to prevent crash"
Andre Eisenbach [Fri, 15 Jul 2016 16:58:18 +0000 (16:58 +0000)]
Merge "MAP: Remove redundant call to sendShutdownMessage to prevent crash"

8 years agoMAP: Remove redundant call to sendShutdownMessage to prevent crash
Hemant Gupta [Mon, 6 Jun 2016 17:33:19 +0000 (23:03 +0530)]
MAP: Remove redundant call to sendShutdownMessage to prevent crash

Usecase:
Perform BT off/on repeatedly.

Issue:
Bluetooth crashes.

Fix:
Remove redundant call to sendShutdownMessage() from stop API to prevent
MapServiceMessageHandler becoming null and being dereferenced.

Bug: 29149190
Change-Id: I739664975043c4a1895fd2113869c87cdb704338

8 years agoMerge \"PAN: Avoid reconfiguration of bt-pan interface in NAP role\"
Hemant Gupta [Thu, 14 Jul 2016 20:36:51 +0000 (20:36 +0000)]
Merge \"PAN: Avoid reconfiguration of bt-pan interface in NAP role\"
am: aa83abd905

Change-Id: I084e393e11a893744a6b05b9a9ed3227b0df121a

8 years agoMerge "PAN: Avoid reconfiguration of bt-pan interface in NAP role"
Treehugger Robot [Thu, 14 Jul 2016 20:31:11 +0000 (20:31 +0000)]
Merge "PAN: Avoid reconfiguration of bt-pan interface in NAP role"

8 years agoPAN: Avoid reconfiguration of bt-pan interface in NAP role
Hemant Gupta [Thu, 16 Jun 2016 15:15:29 +0000 (20:45 +0530)]
PAN: Avoid reconfiguration of bt-pan interface in NAP role

Issue:
Browsing is not working with remote PANU Device(s).

RCA:
DUT is in NAP role, bt-pan interface is configured for NAP role,
when 1st remote PANU is connected. bt-pan interface is being
reconfigured, whenever 2nd PANU is connected, which leads bt-pan
interface to go in bad state. BT is able to write Ethernet packets on
bt-pan interface(TUN driver) after reconfiguration, but it's
unable to read Ethernet packets from bt-pan interface(TUN driver).

Fix:
If bt-pan interface is already configured in NAP role,
then do not reconfigure bt-pan, when 2nd PANU is connected.

BUG: 29992925
Change-Id: Ib6e0cb91d573649af45ffe25c7095a4bd74a5022

8 years agoMerge \"Fix AVRCP crash, position and state tracking\"
Marie Janssen [Wed, 13 Jul 2016 21:39:02 +0000 (21:39 +0000)]
Merge \"Fix AVRCP crash, position and state tracking\"
am: 5b8a0db93b

Change-Id: Ic553fbdb7e2bbb2356b0525e8d54a2a59945d27e

8 years agoMerge "Fix AVRCP crash, position and state tracking"
Marie Janssen [Wed, 13 Jul 2016 21:25:53 +0000 (21:25 +0000)]
Merge "Fix AVRCP crash, position and state tracking"

8 years agoFix AVRCP crash, position and state tracking
Marie Janssen [Tue, 12 Jul 2016 14:53:54 +0000 (07:53 -0700)]
Fix AVRCP crash, position and state tracking

When the MediaController goes away (media stops) a NPE would cause a
crash.

Initialize the position so that an initial notification gets sent
when position is requested, send it when the music is paused, and
send play state whenever the app sends us a play state update.

Bug: 30039744
Bug: 29416450
Change-Id: I44397b3dc40d328fa75a2c15875fad298a5090dd

8 years agoAdd foreground flag to AG_CALL_CHANGED broadcast intent.
Lianchao Song [Fri, 8 Jul 2016 11:07:21 +0000 (19:07 +0800)]
Add foreground flag to AG_CALL_CHANGED broadcast intent.

To fix the issue that the watch is still ringing after answer an
incoming call on phone. It is caused by the ACTION_CALL_CHANGED
broadcast reception processing delayed.

Bug:29931814

Change-Id: I8d8f297c3a13dfe65674eca94724a50d82618f5e
Signed-off-by: m00230717 <m00230717@notesmail.huawei.com>
8 years agoMerge \"Check for call/call setup state before creating SCO\"
Satish Kodishala [Thu, 7 Jul 2016 22:30:55 +0000 (22:30 +0000)]
Merge \"Check for call/call setup state before creating SCO\"
am: 598902d8e2

Change-Id: I74d86b349b86efb7c82f114aa72be4a4af55ce0a

8 years agoMerge "Check for call/call setup state before creating SCO"
Andre Eisenbach [Thu, 7 Jul 2016 22:20:39 +0000 (22:20 +0000)]
Merge "Check for call/call setup state before creating SCO"

8 years agoCheck for call/call setup state before creating SCO
Satish Kodishala [Wed, 4 May 2016 14:11:24 +0000 (19:41 +0530)]
Check for call/call setup state before creating SCO

Use case:
1. Run HFP AG PTS test cases.
or
1. Pair and connect phone with Sony xba-bt75 Bluetooth headset.
2. Make incoming call and accept it.

Failure:
PTS test cases fail. There will be no call audio on
Sony xba-bt75 headset.

Root cause:
Telephony asking to create SCO before incoming call
is accepted.

Fix:
If there is no active/held call, outgoing call setup
in progress, we should not create SCO. Telephony will
ask to create SCO for incoming call before the call
becomes active, this creates IOT issues and fail below
PTS test cases.
TC_AG_ACC_BV_08_I
TC_AG_ACC_BV_10_I
TC_AG_ACC_BV_11_I
TC_AG_ACC_BV_12_I
TC_AG_ACC_BV_13_I
TC_AG_ACC_BV_14_I

Bug: 29417803
Change-Id: I0c1002b31da65cbc0b0e74b590468d37ea51d065

8 years agoMerge \"Refactor playback position tracking\"
Marie Janssen [Fri, 1 Jul 2016 23:33:09 +0000 (23:33 +0000)]
Merge \"Refactor playback position tracking\"
am: 0d83e2969a

Change-Id: I02e4595765448e2b475b7192d8468eb588a774c5

8 years agoMerge "Refactor playback position tracking"
Marie Janssen [Fri, 1 Jul 2016 23:26:07 +0000 (23:26 +0000)]
Merge "Refactor playback position tracking"

8 years agoRefactor playback position tracking
Marie Janssen [Thu, 30 Jun 2016 21:29:18 +0000 (14:29 -0700)]
Refactor playback position tracking

Use PlaybackState directly to track the position through time.  Update
the state when necessary (track changes, etc.)

Remove complex logic and centralize sending of Play Position
Notificaiton response and scheduling.

Update dumpsys and add current package session.

Bug: 29416450
Bug: 29606822

Change-Id: Ie82b48d6d7f9e1a05b64835731433d05a3a3a41a

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:48:10 +0000 (04:48 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 03:30:35 +0000 (20:30 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Idcc9b8fe3f43c8d81a5e11bd6e42f2096406775d

8 years agoMerge \"Fix misc-macro-parentheses warnings\"
Chih-Hung Hsieh [Fri, 1 Jul 2016 00:59:45 +0000 (00:59 +0000)]
Merge \"Fix misc-macro-parentheses warnings\"
am: 89902a185b

Change-Id: Id01ad59201fd97150ecb1ecc539255f64a021246

8 years agoMerge "Fix misc-macro-parentheses warnings"
Treehugger Robot [Fri, 1 Jul 2016 00:54:16 +0000 (00:54 +0000)]
Merge "Fix misc-macro-parentheses warnings"

8 years agoMerge \"Fix work profile app not being able to create bond\"
Jakub Pawlowski [Fri, 1 Jul 2016 00:27:49 +0000 (00:27 +0000)]
Merge \"Fix work profile app not being able to create bond\"
am: 61ca891c48

Change-Id: I38ddc0e7e26b70c8041672af5fddd7c3ade601a8

8 years agoMerge "Fix work profile app not being able to create bond"
Jakub Pawlowski [Thu, 30 Jun 2016 23:58:22 +0000 (23:58 +0000)]
Merge "Fix work profile app not being able to create bond"

8 years agoFix misc-macro-parentheses warnings
Chih-Hung Hsieh [Fri, 10 Jun 2016 17:35:43 +0000 (10:35 -0700)]
Fix misc-macro-parentheses warnings

Add parentheses around macro arguments used beside operators.

Bug: 28705665
Change-Id: I6ef4764d3565b7ce6eb18570a6bf8c98b6b3631c

8 years agoUse the live AdapterService in ProfileService.
Calvin On [Fri, 24 Jun 2016 00:10:41 +0000 (00:10 +0000)]
Use the live AdapterService in ProfileService.
am: d4152d61ac

Change-Id: I4755e0a99783caf68b4c6a84f9507d6764a87b87

8 years agoUse the live AdapterService in ProfileService.
Calvin On [Wed, 22 Jun 2016 21:23:49 +0000 (14:23 -0700)]
Use the live AdapterService in ProfileService.

Previously, if AdapterService was null while ProfileService is
created, the ProfileService would never work because it would
store a stale reference to the AdapterService.

This change ensures that ProfileService accesses the current
AdapterService at any given time.

Bug: 29519304
Bug: 29610505

Change-Id: I25efbf4a58932f519ac9f0b89c4112a442c994eb
(cherry picked from commit b55c6a1f4ce60ad552e9c9a6d06fab6781a4dadb)

8 years agoClose output stream before getting response
Ajay Panicker [Thu, 23 Jun 2016 20:46:29 +0000 (20:46 +0000)]
Close output stream before getting response
am: e026ad5004

Change-Id: I55fc6fee16f4e25817fc6cbad37e83052a41a7dd

8 years agoClose output stream before getting response
Ajay Panicker [Thu, 23 Jun 2016 20:29:34 +0000 (13:29 -0700)]
Close output stream before getting response

If the output stream is still open after finishing the sending of
a file, a CONTINUE response code is received instead of an OK code.

Bug: 29583227
Change-Id: I1b2515e8fe5eec208bbbe1df17f96cc20c5ea884

8 years agoMerge commit '303ef0bd1343806adba9b00e39ca05b7c9e50a4f' into manual_merge_303ef0b
Adam Lesinski [Wed, 22 Jun 2016 19:05:53 +0000 (12:05 -0700)]
Merge commit '303ef0bd1343806adba9b00e39ca05b7c9e50a4f' into manual_merge_303ef0b

Change-Id: I9cfbac32c1a9758860e856bd0cbfa4f9985d6690

8 years agoMerge "Prevent energy data overflow" into nyc-dev
Adam Lesinski [Wed, 22 Jun 2016 18:48:20 +0000 (18:48 +0000)]
Merge "Prevent energy data overflow" into nyc-dev

8 years agoFix how file size is calculated if not provided
Ajay Panicker [Tue, 21 Jun 2016 23:38:53 +0000 (23:38 +0000)]
Fix how file size is calculated if not provided
am: 120ba1db4d

Change-Id: I891ecc0ba9c66d37ac785df4412a0ab69390026b

8 years agoFix how file size is calculated if not provided
Ajay Panicker [Tue, 21 Jun 2016 00:54:36 +0000 (17:54 -0700)]
Fix how file size is calculated if not provided

Currently if there is no file size provided, InputStream.available()
is used to guess how many bytes are available. According to the
java documentation, available() should not be used to calculate
file sizes, as it isn't guarenteed to return the total number of
bytes in the stream. This is fixed by reading the stream to
calculate the length, then resetting the stream.

Bug: 29334784
Change-Id: Ic851c46d053157e4d5404352d76f9ff87a509607

8 years agoPrevent energy data overflow
Adam Lesinski [Tue, 21 Jun 2016 01:46:55 +0000 (18:46 -0700)]
Prevent energy data overflow

- Stores energy data as longs
- Monitors for overflow and logs + discards sample

Bug:27598905
Change-Id: I442c0f63adb5197a45e7982e68f1260c856ed351

8 years agoMerge \\"Vectors as parameters to GATT (2/3)\\" am: d3b3006b32
Jakub Pawlowski [Mon, 20 Jun 2016 22:42:46 +0000 (22:42 +0000)]
Merge \\"Vectors as parameters to GATT (2/3)\\" am: d3b3006b32
am: f35b6cf04e

Change-Id: I0403260b56219dfdb6c5ac122b327c2fd9d9daf6

8 years agoMerge \"Vectors as parameters to GATT (2/3)\"
Jakub Pawlowski [Mon, 20 Jun 2016 22:37:36 +0000 (22:37 +0000)]
Merge \"Vectors as parameters to GATT (2/3)\"
am: d3b3006b32

Change-Id: Idfd8188d8414e210ef45217a78b0118bc2e02aec

8 years agoMerge "Vectors as parameters to GATT (2/3)"
Jakub Pawlowski [Mon, 20 Jun 2016 22:35:49 +0000 (22:35 +0000)]
Merge "Vectors as parameters to GATT (2/3)"

8 years agoMerge \\"Vectors as parameters to GATT write/indicate (2/3)\\" am: 6ff73f0db0
Jakub Pawlowski [Mon, 20 Jun 2016 18:10:55 +0000 (18:10 +0000)]
Merge \\"Vectors as parameters to GATT write/indicate (2/3)\\" am: 6ff73f0db0
am: 5eef5be110

Change-Id: Ib5ec0f3a39a7e85bc333bd5c8b7096a4906ff467

8 years agoMerge \"Vectors as parameters to GATT write/indicate (2/3)\"
Jakub Pawlowski [Mon, 20 Jun 2016 18:05:36 +0000 (18:05 +0000)]
Merge \"Vectors as parameters to GATT write/indicate (2/3)\"
am: 6ff73f0db0

Change-Id: Icbe4d10addaa4ef47d94b34ae7eed15fb621307e

8 years agoVectors as parameters to GATT (2/3)
Jakub Pawlowski [Tue, 31 May 2016 20:12:34 +0000 (13:12 -0700)]
Vectors as parameters to GATT (2/3)

Bug: 29005882
Bug: 28485365
Change-Id: I3c1a53ed2766b6b7b8d914da3d19875dd67ddd7d

8 years agoMerge "Vectors as parameters to GATT write/indicate (2/3)"
Jakub Pawlowski [Mon, 20 Jun 2016 18:00:54 +0000 (18:00 +0000)]
Merge "Vectors as parameters to GATT write/indicate (2/3)"

8 years agoVectors as parameters to GATT write/indicate (2/3)
Jakub Pawlowski [Fri, 27 May 2016 23:36:06 +0000 (16:36 -0700)]
Vectors as parameters to GATT write/indicate (2/3)

Bug: 29005882
Bug: 28485365
Change-Id: Iac09cb6dc66cf48e8c52030de44d27afe24b0b99

8 years agoMerge \\"Fix sender name string to match MAP spec\\" am: 6b9c9d4458
Andre Eisenbach [Thu, 16 Jun 2016 21:49:28 +0000 (21:49 +0000)]
Merge \\"Fix sender name string to match MAP spec\\" am: 6b9c9d4458
am: a2823f7e34

Change-Id: I76946cbaa6d1e726beb6c7c6a6e44ca485e3ea94

8 years agoMerge \"Fix sender name string to match MAP spec\"
Ajay Panicker [Thu, 16 Jun 2016 21:44:11 +0000 (21:44 +0000)]
Merge \"Fix sender name string to match MAP spec\"
am: 6b9c9d4458

Change-Id: I7d528b876ebaf7ed0e048cdd72eb3521c1f1a309

8 years agoMerge "Fix sender name string to match MAP spec"
Andre Eisenbach [Thu, 16 Jun 2016 21:28:29 +0000 (21:28 +0000)]
Merge "Fix sender name string to match MAP spec"

8 years agoFix sender name string to match MAP spec
Ajay Panicker [Fri, 19 Feb 2016 21:53:17 +0000 (13:53 -0800)]
Fix sender name string to match MAP spec

In section 3.1.6 of the Bluetooth MAP spec version
1.2.2, the field name should be "sender_name" instead
of "senderName".

Bug: 26904410
Change-Id: I0dacaf50b0830239d2c2e7e787dc7998f3ed6723

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 20:33:06 +0000 (20:33 +0000)]
Import translations. DO NOT MERGE
am: 720b9fd1a3  -s ours

Change-Id: Ifc431fcf953313840ba1fc5cccd5c161c4e68d22

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 20:17:20 +0000 (13:17 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I4ab9b1d07af08a87f41da8e95072fb018837a5bb

8 years agoMerge \\"Fix null callback in updateCurrentMediaControllers\\" am: f533643e2b
Jakub Pawlowski [Thu, 16 Jun 2016 17:37:32 +0000 (17:37 +0000)]
Merge \\"Fix null callback in updateCurrentMediaControllers\\" am: f533643e2b
am: ed7ceb136f

Change-Id: I9eba1bbc3e7828f8d6d6f58bba7bfabf1b103cde

8 years agoMerge \"Fix null callback in updateCurrentMediaControllers\"
Jakub Pawlowski [Thu, 16 Jun 2016 17:34:41 +0000 (17:34 +0000)]
Merge \"Fix null callback in updateCurrentMediaControllers\"
am: f533643e2b

Change-Id: I29edb9f667095e0089f864aaabd5ef0b9090f26e

8 years agoMerge "Fix null callback in updateCurrentMediaControllers"
Jakub Pawlowski [Thu, 16 Jun 2016 17:24:03 +0000 (17:24 +0000)]
Merge "Fix null callback in updateCurrentMediaControllers"

8 years agoFix null callback in updateCurrentMediaControllers
Jakub Pawlowski [Thu, 16 Jun 2016 00:58:46 +0000 (17:58 -0700)]
Fix null callback in updateCurrentMediaControllers

Change-Id: I0f134ce147b8a7396c87900fb4770606d53dd765

8 years agoMerge \\"AVRCP: Handle multiple MediaController instances\\" am: d6d2993587
Marie Janssen [Wed, 15 Jun 2016 23:36:24 +0000 (23:36 +0000)]
Merge \\"AVRCP: Handle multiple MediaController instances\\" am: d6d2993587
am: 9350175ee7

Change-Id: I13fa1202796805ff6cc55a804ebbcd97b9d29e42

8 years agoMerge \"AVRCP: Handle multiple MediaController instances\"
Marie Janssen [Wed, 15 Jun 2016 23:34:03 +0000 (23:34 +0000)]
Merge \"AVRCP: Handle multiple MediaController instances\"
am: d6d2993587

Change-Id: I3c041a36caaf4ca5ef9d12ee0cc389acab1bfce5