OSDN Git Service
Matthew Xie [Thu, 23 Oct 2014 19:53:40 +0000 (12:53 -0700)]
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
bug
17770561
Change-Id: I34fb018d9787b4deef8592c71f5539778e76e325
Wei Wang [Mon, 20 Oct 2014 21:45:57 +0000 (21:45 +0000)]
am
e12e03fa: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
* commit '
e12e03fa300719166b874b90dba7f3fe9399891a':
Remove spammy log information for BLE scan.
Wei Wang [Mon, 20 Oct 2014 21:41:19 +0000 (21:41 +0000)]
Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
Baligh Uddin [Mon, 20 Oct 2014 14:29:54 +0000 (14:29 +0000)]
am
e580e4ab: (-s ours) am
cc9c0054: (-s ours) Import translations. DO NOT MERGE
* commit '
e580e4ab846d7ebfe4831e0971927b1a8c0a7ed8':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 20 Oct 2014 14:27:26 +0000 (14:27 +0000)]
am
cc9c0054: (-s ours) Import translations. DO NOT MERGE
* commit '
cc9c005472000cc2f26361bb66074c31292e10ef':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 20 Oct 2014 07:30:49 +0000 (00:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I52f18022a793f1654570278cc0336234f694a6b6
Auto-generated-cl: translation import
Wei Wang [Fri, 17 Oct 2014 22:33:10 +0000 (15:33 -0700)]
Remove spammy log information for BLE scan.
Bug:
17574681
Change-Id: I44a9725aa4103734418411e6dac9c2e6ec564c4d
Matthew Xie [Wed, 15 Oct 2014 05:10:36 +0000 (05:10 +0000)]
am
1cecad26: am
7a306fb7: Merge "Update AVRCP play status only if music is streaming" into lmp-dev
* commit '
1cecad2692a0b0a8e81e5eb5ed8206b0d98edb38':
Update AVRCP play status only if music is streaming
Matthew Xie [Wed, 15 Oct 2014 05:08:21 +0000 (05:08 +0000)]
am
7a306fb7: Merge "Update AVRCP play status only if music is streaming" into lmp-dev
* commit '
7a306fb7b52cdf99411aaef4c7b44f51a14dc559':
Update AVRCP play status only if music is streaming
Matthew Xie [Wed, 15 Oct 2014 05:04:58 +0000 (05:04 +0000)]
Merge "Update AVRCP play status only if music is streaming" into lmp-dev
Wei Wang [Mon, 13 Oct 2014 23:05:32 +0000 (23:05 +0000)]
am
30d2be91: Merge "Remove one line of unused code." into lmp-sprout-dev
* commit '
30d2be9137b94ea43a6af8f5c6da5765e06138b3':
Remove one line of unused code.
Wei Wang [Mon, 13 Oct 2014 23:05:32 +0000 (23:05 +0000)]
am
671e9ea9: Merge "Add support of advertising through standard instance.(2/4)" into lmp-sprout-dev
* commit '
671e9ea90eb85e1a993ff2d56e02d1014a1b8f39':
Add support of advertising through standard instance.(2/4)
Wei Wang [Mon, 13 Oct 2014 23:03:20 +0000 (23:03 +0000)]
Merge "Remove one line of unused code." into lmp-sprout-dev
Wei Wang [Mon, 13 Oct 2014 23:02:29 +0000 (23:02 +0000)]
Merge "Add support of advertising through standard instance.(2/4)" into lmp-sprout-dev
Tyler Gunn [Fri, 10 Oct 2014 22:53:11 +0000 (22:53 +0000)]
am
93e837db: am
a40ac96c: Issue: turning on bluetooth headset in call doesn\'t change route (2/2).
* commit '
93e837dba1f1e976fe827466e2b2c3bd6f1d6ada':
Issue: turning on bluetooth headset in call doesn't change route (2/2).
Tyler Gunn [Fri, 10 Oct 2014 19:07:23 +0000 (19:07 +0000)]
am
a40ac96c: Issue: turning on bluetooth headset in call doesn\'t change route (2/2).
* commit '
a40ac96c186b6f2105906bb07be45fc8d2ce1436':
Issue: turning on bluetooth headset in call doesn't change route (2/2).
Tyler Gunn [Fri, 10 Oct 2014 18:49:59 +0000 (11:49 -0700)]
Issue: turning on bluetooth headset in call doesn't change route (2/2).
In addition to a failure to report CallState from Telecom, the broadcast
of the state change was happening before the active device was set,
causing Telecom to receive the broadcast indicating the audio state has
changed, only to have the Bluetooth service report that bluetooth audio
is not connected yet.
Bug:
17933664
Change-Id: Id4e7c6d4085f5ee990a8d19da8c089399ee60c6d
Ravi Nagarajan [Thu, 9 Oct 2014 06:12:10 +0000 (11:42 +0530)]
Update AVRCP play status only if music is streaming
AVRCP play status was updated based on AVDTP stream state. Enhanced this
logic to update the status only when music is streaming
bug
12099469
Change-Id: Idef0180cd0d0b78fa392a5354320440fce9b81a7
Wei Wang [Thu, 2 Oct 2014 02:10:31 +0000 (19:10 -0700)]
Remove one line of unused code.
Bug:
17769926
Change-Id: I02072dd113e846e485e9d69e11585e6ab49dfc5e
Tyler Gunn [Thu, 9 Oct 2014 19:22:43 +0000 (19:22 +0000)]
am
5907b588: am
fbb1fe1e: Moving STATE_DISCONNECTED broadcast.
* commit '
5907b58808823e6b1c8835588c4eb65d2f00ba69':
Moving STATE_DISCONNECTED broadcast.
Tyler Gunn [Thu, 9 Oct 2014 19:09:54 +0000 (19:09 +0000)]
am
fbb1fe1e: Moving STATE_DISCONNECTED broadcast.
* commit '
fbb1fe1efa8459f932aed161fbcc0b5e4d52c2d5':
Moving STATE_DISCONNECTED broadcast.
Wei Wang [Tue, 23 Sep 2014 03:14:30 +0000 (20:14 -0700)]
Add support of advertising through standard instance.(2/4)
Use standard advertising instance if peripheral mode is support but multi adv is not.
Bug:
17552672
Change-Id: I21044665d0ac38f84abb95bfe1348d7bf83bfd2a
Tyler Gunn [Wed, 8 Oct 2014 21:12:38 +0000 (14:12 -0700)]
Moving STATE_DISCONNECTED broadcast.
In Telecom we were seeing a bug where we received an
ACTION_CONNECTION_STATE_CHANGEDSTATE intent indicating the disconnection
of a bluetooth headset. The BluetoothManager in Telecom would then
query the Bluetooth service to see if there are any devices. Despite
being informed that the device in use was disconnected, it still showed
up as connected.
To fix this, I moved the state broadcast AFTER the disconnected device is
removed from the headset state machine. Looking through all other
disconnect broadcasts in that file, the disconnection happens AFTER in
all other cases as well.
Bug:
17899941
Change-Id: Ice4b2a5b1093e04ffe4c3241a3379aba56898792
Geoff Mendal [Wed, 8 Oct 2014 18:32:22 +0000 (18:32 +0000)]
am
6482273e: (-s ours) am
4ebb0071: (-s ours) Import translations. DO NOT MERGE
* commit '
6482273e836a7a6de5f8d05562ddc1afc2bfa828':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Oct 2014 18:16:26 +0000 (18:16 +0000)]
am
4ebb0071: (-s ours) Import translations. DO NOT MERGE
* commit '
4ebb0071df6adcbad54a3348bf04bdb071e1e6db':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Oct 2014 13:40:08 +0000 (13:40 +0000)]
am
be6092a3: (-s ours) Import translations. DO NOT MERGE
* commit '
be6092a39c55eaa19668acf197b28b658f17cb33':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Oct 2014 13:20:06 +0000 (06:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia01995677881ba61751cb5cf11e532ce4d3fda03
Auto-generated-cl: translation import
Geoff Mendal [Wed, 8 Oct 2014 13:19:30 +0000 (06:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ce90f8a0011502ad40c8f32c61ed7e4878ea6dc
Auto-generated-cl: translation import
Geoff Mendal [Wed, 8 Oct 2014 13:19:06 +0000 (06:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I434b212750272dd181ee6e82046d0a289afe9b90
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 16:18:58 +0000 (16:18 +0000)]
am
b28a786f: (-s ours) am
b5f2e79b: (-s ours) Import translations. DO NOT MERGE
* commit '
b28a786fe25e89416147cbb68c1ef72c3ea9cb5d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 16:18:58 +0000 (16:18 +0000)]
am
4212bfbc: (-s ours) Import translations. DO NOT MERGE
* commit '
4212bfbcc2ee226ba91ba5e95247d7d6111a8c03':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 16:17:54 +0000 (16:17 +0000)]
am
b5f2e79b: (-s ours) Import translations. DO NOT MERGE
* commit '
b5f2e79b577457084b6aacda765f02980ee413a0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 16:12:41 +0000 (09:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I86f9aa2290a8ccc0bfa970e330d1f2b352378a76
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 16:11:49 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I18e67800b60d947fac4cd0f0cc22d324672df418
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 16:11:26 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20e6d90e2d4e875b6bd4d20cb262b4e5a6b02b67
Auto-generated-cl: translation import
Baligh Uddin [Sun, 5 Oct 2014 17:47:52 +0000 (17:47 +0000)]
am
ca2ae438: (-s ours) am
3e48bde0: (-s ours) Import translations. DO NOT MERGE
* commit '
ca2ae438461c7ff80203da6c2a8f83f7be208cb7':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 17:43:50 +0000 (17:43 +0000)]
am
0c1440a9: (-s ours) Import translations. DO NOT MERGE
* commit '
0c1440a92ba7193d4c08b269223bb2552dd20937':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 17:40:01 +0000 (17:40 +0000)]
am
3e48bde0: (-s ours) Import translations. DO NOT MERGE
* commit '
3e48bde09c34a880fe2231022ba64561ab5e4239':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 4 Oct 2014 16:05:37 +0000 (09:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e6ca72a9fef896d5b44149009678296b51f43c2
Auto-generated-cl: translation import
Baligh Uddin [Sat, 4 Oct 2014 16:04:46 +0000 (09:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I73c746d3d65e7d9392f39c03310278a1147f552c
Auto-generated-cl: translation import
Baligh Uddin [Sat, 4 Oct 2014 16:04:09 +0000 (09:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I38c13605fc92a6b76ba6bd2dad1aa9aef340cc10
Auto-generated-cl: translation import
Matthew Xie [Thu, 2 Oct 2014 07:10:59 +0000 (07:10 +0000)]
am
b5f209a8: am
3d4a5452: Merge "MAP: Return OBEX_HTTP_NOT_IMPLEMENTED for msgUpdate for sms/mms" into lmp-dev
* commit '
b5f209a8886cb6ee47535f4f3878b6eff9c80709':
MAP: Return OBEX_HTTP_NOT_IMPLEMENTED for msgUpdate for sms/mms
Matthew Xie [Thu, 2 Oct 2014 07:07:07 +0000 (07:07 +0000)]
am
3d4a5452: Merge "MAP: Return OBEX_HTTP_NOT_IMPLEMENTED for msgUpdate for sms/mms" into lmp-dev
* commit '
3d4a54529dd6033c082113b600d945531b759492':
MAP: Return OBEX_HTTP_NOT_IMPLEMENTED for msgUpdate for sms/mms
Matthew Xie [Thu, 2 Oct 2014 07:02:02 +0000 (07:02 +0000)]
Merge "MAP: Return OBEX_HTTP_NOT_IMPLEMENTED for msgUpdate for sms/mms" into lmp-dev
Prem Kumar [Thu, 2 Oct 2014 06:52:30 +0000 (06:52 +0000)]
am
2d97e3bd: am
0bdf4df1: Merge "Add HOGP as hid profile when the remote device contain HOGP service" into lmp-dev
* commit '
2d97e3bd45542e6e0289151fa0606e54247ddfd3':
Add HOGP as hid profile when the remote device contain HOGP service
Prem Kumar [Thu, 2 Oct 2014 06:48:20 +0000 (06:48 +0000)]
am
0bdf4df1: Merge "Add HOGP as hid profile when the remote device contain HOGP service" into lmp-dev
* commit '
0bdf4df10c03602f609a1eb23aabe1fe772a89fd':
Add HOGP as hid profile when the remote device contain HOGP service
Prem Kumar [Thu, 2 Oct 2014 06:43:21 +0000 (06:43 +0000)]
Merge "Add HOGP as hid profile when the remote device contain HOGP service" into lmp-dev
Matthew Xie [Wed, 1 Oct 2014 17:36:29 +0000 (10:36 -0700)]
MAP: Return OBEX_HTTP_NOT_IMPLEMENTED for msgUpdate for sms/mms
In MAP profile message update is not implemented for sms/mms.
bug
17723738
Change-Id: I6c7baaf9e6f54e7af1b6c8458a6a458239da7d10
PauloftheWest [Wed, 1 Oct 2014 15:08:43 +0000 (15:08 +0000)]
am
99f9e9b5: am
335b2b8f: Fixed a Bluetooth MAP bug.
* commit '
99f9e9b58a4214280d3ef678d098c2062c890815':
Fixed a Bluetooth MAP bug.
PauloftheWest [Wed, 1 Oct 2014 14:58:40 +0000 (14:58 +0000)]
am
335b2b8f: Fixed a Bluetooth MAP bug.
* commit '
335b2b8f6f17c93a4c2b192c8e1b629e48b230b3':
Fixed a Bluetooth MAP bug.
Matthew Xie [Tue, 30 Sep 2014 03:54:34 +0000 (20:54 -0700)]
Add HOGP as hid profile when the remote device contain HOGP service
bug
17409862
Change-Id: I018f12facefa7fb7bf2c3b46e639c40a8a67eae4
Baligh Uddin [Mon, 29 Sep 2014 21:00:54 +0000 (21:00 +0000)]
am
3e5cc9be: (-s ours) am
20326a32: (-s ours) Import translations. DO NOT MERGE
* commit '
3e5cc9bea084e985359032671561628ac188b445':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Sep 2014 20:47:15 +0000 (20:47 +0000)]
am
20326a32: (-s ours) Import translations. DO NOT MERGE
* commit '
20326a3263b8bd71ea98d5ea88e53cf0f6715d33':
Import translations. DO NOT MERGE
PauloftheWest [Mon, 29 Sep 2014 17:37:29 +0000 (10:37 -0700)]
Fixed a Bluetooth MAP bug.
+ Beforehand, if a user disabled MAP and then unpaired the device, then
Settings would automatically deny future MAP requests from the device.
Bug:
17391677
Change-Id: I068f37426ed6a044ed2b5e9391cd9dd00908f867
Matthew Xie [Mon, 29 Sep 2014 04:19:25 +0000 (04:19 +0000)]
am
01e6b152: am
acb400b0: Merge "BT MAP: fix problem with fetching CDMA messages" into lmp-dev
* commit '
01e6b152e182721e5d5dc28d9ae3e15d1c88eb7d':
BT MAP: fix problem with fetching CDMA messages
Matthew Xie [Mon, 29 Sep 2014 02:57:53 +0000 (02:57 +0000)]
am
acb400b0: Merge "BT MAP: fix problem with fetching CDMA messages" into lmp-dev
* commit '
acb400b0598107c0427e3fb07b0a4a8fade5481e':
BT MAP: fix problem with fetching CDMA messages
Baligh Uddin [Mon, 29 Sep 2014 02:37:49 +0000 (19:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19b08d7d4dc62fcc770506724b8bf05262f2d861
Auto-generated-cl: translation import
Matthew Xie [Sun, 28 Sep 2014 21:38:41 +0000 (21:38 +0000)]
Merge "BT MAP: fix problem with fetching CDMA messages" into lmp-dev
Baligh Uddin [Sat, 27 Sep 2014 07:43:04 +0000 (07:43 +0000)]
am
105f5cef: (-s ours) am
26a590e9: (-s ours) Import translations. DO NOT MERGE
* commit '
105f5cefb0f6362da78310b29d212576a55cefa6':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 27 Sep 2014 07:38:19 +0000 (07:38 +0000)]
am
310dc8b6: (-s ours) Import translations. DO NOT MERGE
* commit '
310dc8b646dff39efef25dd14808a2e720c27155':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 27 Sep 2014 07:38:17 +0000 (07:38 +0000)]
am
26a590e9: (-s ours) Import translations. DO NOT MERGE
* commit '
26a590e91f84c75c58df691c0a57bad223cf7390':
Import translations. DO NOT MERGE
kschulz [Thu, 25 Sep 2014 07:41:39 +0000 (09:41 +0200)]
BT MAP: fix problem with fetching CDMA messages
A bug in Java makes the Long.parse() function throw and exception when message
handles start to become negative (which happens for CDMA SMS messages).
Fix simply shifts the handle masks on byte down in order to get around
the bug.
Bug:
17627572
Change-Id: Ie41aef589dc9d3ecb8bc7167472218e57a52fa33
Baligh Uddin [Thu, 25 Sep 2014 05:05:11 +0000 (22:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2c39716c73d364b334c955c34d0122848dc3c88
Auto-generated-cl: translation import
Baligh Uddin [Thu, 25 Sep 2014 05:04:11 +0000 (22:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I625d16c3d31f03272002e411ad77bca489af2549
Auto-generated-cl: translation import
Baligh Uddin [Thu, 25 Sep 2014 05:03:37 +0000 (22:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I32bce34d0754b5896ba88a1981a4917a1dbdd25a
Auto-generated-cl: translation import
Andre Eisenbach [Wed, 24 Sep 2014 23:47:05 +0000 (23:47 +0000)]
am
f83ecae3: am
b5b51ca8: Merge "Defer callbacks if the transport is congested" into lmp-dev
* commit '
f83ecae321db18c40a867f4079a04e521ee2e472':
Defer callbacks if the transport is congested
Andre Eisenbach [Wed, 24 Sep 2014 22:22:52 +0000 (22:22 +0000)]
am
b5b51ca8: Merge "Defer callbacks if the transport is congested" into lmp-dev
* commit '
b5b51ca82e3db31705e54687f998b1ea1787396a':
Defer callbacks if the transport is congested
Andre Eisenbach [Wed, 24 Sep 2014 22:06:23 +0000 (22:06 +0000)]
Merge "Defer callbacks if the transport is congested" into lmp-dev
Ariel Gertzenstein [Wed, 24 Sep 2014 15:04:24 +0000 (15:04 +0000)]
am
09bd88fc: am
a51c13ae: Set FLAG_RECEIVER_FOREGROUND when broadcasting ACTION_PAIRING_REQUEST.
* commit '
09bd88fce8737161cbb577793bf193eeef26cf2c':
Set FLAG_RECEIVER_FOREGROUND when broadcasting ACTION_PAIRING_REQUEST.
Ariel Gertzenstein [Wed, 24 Sep 2014 14:53:22 +0000 (14:53 +0000)]
am
a51c13ae: Set FLAG_RECEIVER_FOREGROUND when broadcasting ACTION_PAIRING_REQUEST.
* commit '
a51c13ae7e6ce56922316a979aef570abafc9f3f':
Set FLAG_RECEIVER_FOREGROUND when broadcasting ACTION_PAIRING_REQUEST.
Prerepa Viswanadham [Fri, 19 Sep 2014 19:54:04 +0000 (12:54 -0700)]
Defer callbacks if the transport is congested
Hold client characteristic write callbacks and server notification
callbacks if the transport is congested. When the congestion clears up,
all queued callbacks are sent to the application.
Bug:
17289507
Change-Id: Ib22d7857ac3990fd3cc922aedd4258013e1af54c
Ariel Gertzenstein [Tue, 23 Sep 2014 18:34:04 +0000 (14:34 -0400)]
Set FLAG_RECEIVER_FOREGROUND when broadcasting
ACTION_PAIRING_REQUEST.
Bug:
17590080
Change-Id: I0a7cde5953f706a2b41b02878f0fdbd2d9e8ae35
Baligh Uddin [Mon, 22 Sep 2014 19:17:40 +0000 (19:17 +0000)]
am
6b21e8f2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
6b21e8f2a14a81619bb25cf24cda6e2b048791ae':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 17:37:09 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Sun, 21 Sep 2014 17:37:04 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Sun, 21 Sep 2014 03:56:48 +0000 (03:56 +0000)]
am
19937138: (-s ours) am
7532f1cd: (-s ours) Import translations. DO NOT MERGE
* commit '
199371381b54bdd639ebeea4b0a4156a5f2c7c1b':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 21 Sep 2014 03:46:53 +0000 (03:46 +0000)]
am
7532f1cd: (-s ours) Import translations. DO NOT MERGE
* commit '
7532f1cdeca345db5a959c6f570bec0f19f0b820':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 20 Sep 2014 18:06:41 +0000 (11:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b9cc949094c5cf55d7fa5d7431501ecceac4689
Auto-generated-cl: translation import
Baligh Uddin [Sat, 20 Sep 2014 18:05:28 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib0a212265703b98aca641475e3528c4fccadaa69
Auto-generated-cl: translation import
Baligh Uddin [Sat, 20 Sep 2014 18:04:26 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4a80e21aff0f05f77f37f48a042125fb642d71f9
Auto-generated-cl: translation import
Matthew Xie [Fri, 19 Sep 2014 06:43:16 +0000 (06:43 +0000)]
am
69cf1e5b: am
94023bd8: Merge "Save alias in RemoteDevice property before passing it to native layer" into lmp-dev
* commit '
69cf1e5bd33a030780112b8fb221c7cce73df3ce':
Save alias in RemoteDevice property before passing it to native layer
Matthew Xie [Fri, 19 Sep 2014 06:20:26 +0000 (06:20 +0000)]
am
94023bd8: Merge "Save alias in RemoteDevice property before passing it to native layer" into lmp-dev
* commit '
94023bd851cb80966d8f8006702d318057c83f09':
Save alias in RemoteDevice property before passing it to native layer
Matthew Xie [Fri, 19 Sep 2014 04:42:05 +0000 (04:42 +0000)]
Merge "Save alias in RemoteDevice property before passing it to native layer" into lmp-dev
Matthew Xie [Thu, 18 Sep 2014 21:32:57 +0000 (14:32 -0700)]
Save alias in RemoteDevice property before passing it to native layer
bug
17287682
Change-Id: Id7da194f66cf44d41e60f35665dfb1b279cac28f
Baligh Uddin [Thu, 18 Sep 2014 18:49:50 +0000 (18:49 +0000)]
am
9934428f: (-s ours) am
d876e29e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9934428fd59c55ab8f88632c6211e588994ba153':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Sep 2014 18:33:43 +0000 (18:33 +0000)]
am
d876e29e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
d876e29eadbee94fe9933b961e6363ac6e337d90':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Sep 2014 18:04:11 +0000 (18:04 +0000)]
am
4d01fe60: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
4d01fe602f16718322af097fd05d6d6278261caa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Sep 2014 17:56:01 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 18 Sep 2014 17:55:59 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Robert Greenwalt [Thu, 18 Sep 2014 00:23:47 +0000 (00:23 +0000)]
am
b821c49e: am
00ab61e2: Merge "Use unified Tethering Permission Check" into lmp-dev
* commit '
b821c49e043a7b34ce533d41406b8b2de20eaba4':
Use unified Tethering Permission Check
Robert Greenwalt [Thu, 18 Sep 2014 00:11:52 +0000 (00:11 +0000)]
am
00ab61e2: Merge "Use unified Tethering Permission Check" into lmp-dev
* commit '
00ab61e21fd553620a466389907cb4dc089bb221':
Use unified Tethering Permission Check
Robert Greenwalt [Thu, 18 Sep 2014 00:03:38 +0000 (00:03 +0000)]
Merge "Use unified Tethering Permission Check" into lmp-dev
Wei Wang [Wed, 17 Sep 2014 21:18:53 +0000 (21:18 +0000)]
am
6a1885b1: am
e08a0eeb: Fix a typo that compares scanMode with callback types.
* commit '
6a1885b17a039055a19a387c38e176a296a92f7f':
Fix a typo that compares scanMode with callback types.
Wei Wang [Wed, 17 Sep 2014 21:08:19 +0000 (21:08 +0000)]
am
e08a0eeb: Fix a typo that compares scanMode with callback types.
* commit '
e08a0eeb9cbf0ee732171d1c1d353aecdad0a7d2':
Fix a typo that compares scanMode with callback types.
Wei Wang [Wed, 17 Sep 2014 19:30:07 +0000 (12:30 -0700)]
Fix a typo that compares scanMode with callback types.
Bug:
17187159
Change-Id: Ieca583e7cf02d63b9eceda7872511c9db280c04a
Rakesh Iyer [Wed, 17 Sep 2014 17:45:12 +0000 (17:45 +0000)]
am
b530067f: am
620ff342: Merge "Don\'t leak PII into the logs." into lmp-dev
* commit '
b530067f2b3a212297560e8d3af19698eb4b20e9':
Don't leak PII into the logs.
Rakesh Iyer [Wed, 17 Sep 2014 17:24:33 +0000 (17:24 +0000)]
am
620ff342: Merge "Don\'t leak PII into the logs." into lmp-dev
* commit '
620ff342d30c30306d1aa73ec65e209dd3141ff0':
Don't leak PII into the logs.
Rakesh Iyer [Wed, 17 Sep 2014 17:14:36 +0000 (17:14 +0000)]
Merge "Don't leak PII into the logs." into lmp-dev
Wei Wang [Wed, 17 Sep 2014 07:42:33 +0000 (07:42 +0000)]
am
ec1d4bc6: am
33a06059: Merge "Enforce permissions for BLE hidden APIs." into lmp-dev
* commit '
ec1d4bc6e702d180f3871f01c6b4884832f77d4e':
Enforce permissions for BLE hidden APIs.
Wei Wang [Wed, 17 Sep 2014 07:31:28 +0000 (07:31 +0000)]
am
33a06059: Merge "Enforce permissions for BLE hidden APIs." into lmp-dev
* commit '
33a06059be8506003003e41ec020bdce273da1a1':
Enforce permissions for BLE hidden APIs.