OSDN Git Service
Joseph Pirozzo [Fri, 22 Apr 2016 16:20:30 +0000 (09:20 -0700)]
PBAP Download Contacts in state machine
Add refactored code to the new PBAP state machine to implement the safe
downloading of contacts. Key improvements are no internal state
handling, no complex message passing, and an improved ability to abort
and handle error conditions.
bug:
28249138
Change-Id: I30aa6ab6730d92e3ec797392ee9a1be7f55fa46a
Joseph Pirozzo [Tue, 19 Apr 2016 22:00:27 +0000 (15:00 -0700)]
PBAPClient State Machine
Refactor PBAP Client code to function as a state machine. By
consolidating threads and state tracking there is less duplication and
less opportunity for conflicting combinations of state.
bug:
28249138
Change-Id: I20de8041b83024a03bfbb60102c44b4e26579553
Sanket Agarwal [Tue, 17 May 2016 21:46:38 +0000 (14:46 -0700)]
Tackle changing phone numbers by relying on IDs wherever possible.
AG can rewrite numbers (specially with international numbers) or simply
with brackets or other annotation. We currently do not handle such cases
well since phone number match is not accurate. Instead of relying on the
numbers them selves, we rely on the capability of AG to tell the ID of
the call in question.
Bug: b/
28719753
Change-Id: I97842188f174072caf7f03e18b0597ac1912be17
(cherry picked from commit
893033ca82e75e668d74f496938adc94cd443dea)
Jakub Pawlowski [Thu, 16 Jun 2016 17:42:41 +0000 (17:42 +0000)]
Merge \\\\"Fix null callback in updateCurrentMediaControllers\\\\" am:
f533643e2b am:
ed7ceb136f am:
c36b0f6b73
am:
90099d897e
Change-Id: I9672c91aed407c29d570ff9bd5dd4c62252eb680
Jakub Pawlowski [Thu, 16 Jun 2016 17:40:30 +0000 (17:40 +0000)]
Merge \\\"Fix null callback in updateCurrentMediaControllers\\\" am:
f533643e2b am:
ed7ceb136f
am:
c36b0f6b73
Change-Id: I2e0f0909804f2d78de5fc8ad491d3222bfca90e8
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
Jakub Pawlowski [Thu, 16 Jun 2016 17:34:41 +0000 (17:34 +0000)]
Merge \"Fix null callback in updateCurrentMediaControllers\"
am:
f533643e2b
Change-Id: I29edb9f667095e0089f864aaabd5ef0b9090f26e
Jakub Pawlowski [Thu, 16 Jun 2016 17:24:03 +0000 (17:24 +0000)]
Merge "Fix null callback in updateCurrentMediaControllers"
TreeHugger Robot [Thu, 16 Jun 2016 11:28:17 +0000 (11:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 16 Jun 2016 09:49:29 +0000 (02:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I727fd76991e90b3d9c4f508e502ee040a7d383ac
Auto-generated-cl: translation import
Jakub Pawlowski [Thu, 16 Jun 2016 00:58:46 +0000 (17:58 -0700)]
Fix null callback in updateCurrentMediaControllers
Change-Id: I0f134ce147b8a7396c87900fb4770606d53dd765
Marie Janssen [Wed, 15 Jun 2016 23:46:27 +0000 (23:46 +0000)]
Merge \\\\"AVRCP: Handle multiple MediaController instances\\\\" am:
d6d2993587 am:
9350175ee7 am:
d41eb69025
am:
db6af62926
Change-Id: If6e42c8f652afb6c97d81451e925f2ee1b82eaa1
Marie Janssen [Wed, 15 Jun 2016 23:39:08 +0000 (23:39 +0000)]
Merge \\\"AVRCP: Handle multiple MediaController instances\\\" am:
d6d2993587 am:
9350175ee7
am:
d41eb69025
Change-Id: I017074a00186c2976fdf23905bf021e5034538b7
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
Marie Janssen [Wed, 15 Jun 2016 23:34:03 +0000 (23:34 +0000)]
Merge \"AVRCP: Handle multiple MediaController instances\"
am:
d6d2993587
Change-Id: I3c041a36caaf4ca5ef9d12ee0cc389acab1bfce5
Marie Janssen [Wed, 15 Jun 2016 23:12:49 +0000 (23:12 +0000)]
Merge "AVRCP: Handle multiple MediaController instances"
Marie Janssen [Tue, 14 Jun 2016 21:33:14 +0000 (14:33 -0700)]
AVRCP: Handle multiple MediaController instances
Find a MediaController with metadata to show when there are more than
one.
Display more information about the MediaControllers so that we can tell
which packages are being used.
Bug:
29169493
Change-Id: Ifecad6eb44d3461c03685b6650d469721752dfdd
Bill Yi [Tue, 14 Jun 2016 11:28:59 +0000 (04:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I569af10d4b2b6857490b715fc3a3926ff7e345cf
Auto-generated-cl: translation import
Marie Janssen [Mon, 13 Jun 2016 20:59:59 +0000 (20:59 +0000)]
Merge \\\\"Prevent crash on invalid URIs, remove ACTION_OPEN\\\\" am:
b85456f9bd am:
88f03e1262 -s ours am:
65d1f10380
am:
92a03e8782
Change-Id: I95533e80b606b55742d9e85cb5959766d9fcd174
Marie Janssen [Mon, 13 Jun 2016 20:56:10 +0000 (20:56 +0000)]
Merge \\\"Prevent crash on invalid URIs, remove ACTION_OPEN\\\" am:
b85456f9bd am:
88f03e1262 -s ours
am:
65d1f10380
Change-Id: I85e6425de31d086c9e92720394d9c7df779dc65f
Marie Janssen [Mon, 13 Jun 2016 20:52:20 +0000 (20:52 +0000)]
Merge \\"Prevent crash on invalid URIs, remove ACTION_OPEN\\" am:
b85456f9bd
am:
88f03e1262 -s ours
Change-Id: Id222bb90fdf2a2e7965c37319c53d85811a5680b
Marie Janssen [Mon, 13 Jun 2016 20:30:12 +0000 (20:30 +0000)]
Merge \"Prevent crash on invalid URIs, remove ACTION_OPEN\"
am:
b85456f9bd
Change-Id: I0dff47e550e1d836a88ef4ec8a297307cd098abc
Treehugger Robot [Mon, 13 Jun 2016 20:22:43 +0000 (20:22 +0000)]
Merge "Prevent crash on invalid URIs, remove ACTION_OPEN"
ugo_yu [Fri, 10 Jun 2016 20:29:45 +0000 (20:29 +0000)]
Mercedes Benz MAP message listing workaround am:
4786e5ffff
am:
7ce25a8991
Change-Id: I714ac47096e6a273f8575029e29f5b1b24055468
ugo_yu [Fri, 10 Jun 2016 20:23:15 +0000 (20:23 +0000)]
Mercedes Benz MAP message listing workaround
am:
4786e5ffff
Change-Id: If94acb83525f10cc1868c1f5620a68c40677c11e
ugo_yu [Fri, 27 May 2016 12:11:08 +0000 (20:11 +0800)]
Mercedes Benz MAP message listing workaround
Use case:
Sync MAP message to Benz NTG 4.5
Precondition:
1. One of SMS message contains any special characters not ASCII
Steps:
1. Connect with Benz NTG 4.5.
2. Sync SMS message from carkit.
Failure:
Carkit always shows "No Message".
Root Cause:
When this carkit requests the message listing, and any message subject has
non-ASCII special characters in it, the carkit will stop all MAP activity
and stay idle.
Fix:
Strip special characters in the subject tline in message listing
for this carkit.
This change also introduces a Java bases interop database for future
use/expansion.
Bug:
29025011
Change-Id: I4255cbeb068c82f32a68b1022285dfa723e199ec
Marie Janssen [Wed, 25 May 2016 21:27:00 +0000 (14:27 -0700)]
Prevent crash on invalid URIs, remove ACTION_OPEN
Previously if an invalid URI for a notification is received
with ACTION_OPEN, Bluetooth crashed. This fixes this.
It also removes ACTION_OPEN as it is internal-only and unused.
Bug:
28940687
Change-Id: I54e17b7180e770bb8a5cf48c3d4b2a35657cb67f
Marie Janssen [Wed, 8 Jun 2016 16:22:13 +0000 (16:22 +0000)]
resolve merge conflicts of
39957c0 to nyc-dev-plus-aosp am:
4a7ba7568d
am:
ec83a6ce89
Change-Id: If5f58c53069532893c0b68965c484fa83e2a103b
Marie Janssen [Wed, 8 Jun 2016 16:16:57 +0000 (16:16 +0000)]
resolve merge conflicts of
39957c0 to nyc-dev-plus-aosp
am:
4a7ba7568d
Change-Id: Ibb37d4080261604a57af6a37e147b0ae2cf82473
Marie Janssen [Wed, 8 Jun 2016 14:59:24 +0000 (07:59 -0700)]
resolve merge conflicts of
39957c0 to nyc-dev-plus-aosp
Change-Id: Ifa06a51ac390cc2b2f7401b65fb6428313a1f6fd
Marie Janssen [Tue, 7 Jun 2016 23:09:46 +0000 (23:09 +0000)]
Merge \"Cleanup unused requires in java files\"
am:
326172d0eb
Change-Id: I1fb742f0a3657f16d11817ec67a0f187e2747848
Treehugger Robot [Tue, 7 Jun 2016 23:01:27 +0000 (23:01 +0000)]
Merge "Cleanup unused requires in java files"
Marie Janssen [Tue, 10 May 2016 16:33:12 +0000 (09:33 -0700)]
Cleanup unused requires in java files
Change-Id: I7b055c1d3d3f6a69e9f49c077853ab45fcad7106
Bill Yi [Mon, 6 Jun 2016 14:16:41 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0754283774e9567c2db44c3dffd145f09048c569
Auto-generated-cl: translation import
Bill Yi [Sun, 5 Jun 2016 16:05:10 +0000 (16:05 +0000)]
Import translations. DO NOT MERGE am:
397d9de948 -s ours am:
c02fefd86a -s ours
am:
97b81155fa -s ours
* commit '
97b81155fa02edf12dda4b891d9242034eeb0cf6':
Change-Id: I610bf024df47c0242cd8ab2cee227fc344fe9ce1
Bill Yi [Sun, 5 Jun 2016 16:05:09 +0000 (16:05 +0000)]
Import translations. DO NOT MERGE am:
397d9de948 -s ours am:
1128328664 -s ours
am:
ad667de87a -s ours
* commit '
ad667de87acb5a5cc22341e8a0d9c94abfa1b406':
Import translations. DO NOT MERGE
Change-Id: I7ae7e45650dc0a13a38e543a767402f5d6cabee4
Bill Yi [Sun, 5 Jun 2016 16:01:53 +0000 (16:01 +0000)]
Import translations. DO NOT MERGE am:
397d9de948 -s ours
am:
c02fefd86a -s ours
* commit '
c02fefd86a46bab2765947727bda2d066ecb17a0':
Change-Id: I17611340ac9c9248b5b4bddeb32815549a5cdc09
Bill Yi [Sun, 5 Jun 2016 16:00:38 +0000 (16:00 +0000)]
Import translations. DO NOT MERGE am:
5b076e9e05 -s ours
am:
c1d1805cab -s ours
* commit '
c1d1805cabc7e135aee838caa9dea9d8d5958eaa':
Import translations. DO NOT MERGE
Change-Id: I6eb82e609e776ace0489867940e3ec7d6bfd6c1d
Bill Yi [Sun, 5 Jun 2016 16:00:38 +0000 (16:00 +0000)]
Import translations. DO NOT MERGE am:
397d9de948 -s ours
am:
1128328664 -s ours
* commit '
1128328664efa52b7967859a8f5405aae5502688':
Import translations. DO NOT MERGE
Change-Id: I514943d1b67592bffa9cb360ee9e9cdef860051f
Bill Yi [Sun, 5 Jun 2016 15:56:55 +0000 (15:56 +0000)]
Import translations. DO NOT MERGE
am:
397d9de948 -s ours
* commit '
397d9de948c3c5084468401ff1951f2db16260a2':
Import translations. DO NOT MERGE
Change-Id: I2f8abe0d637ffd8a6f44c05f3728b26d2a7df392
Bill Yi [Sun, 5 Jun 2016 15:56:50 +0000 (15:56 +0000)]
Import translations. DO NOT MERGE
am:
5b076e9e05 -s ours
* commit '
5b076e9e051be7ccb83408cc18a36239a50facf9':
Import translations. DO NOT MERGE
Change-Id: I77f0769a0a4395b6332847184cb07887a5cd8aad
Bill Yi [Sun, 5 Jun 2016 15:56:48 +0000 (15:56 +0000)]
Import translations. DO NOT MERGE
am:
397d9de948 -s ours
* commit '
397d9de948c3c5084468401ff1951f2db16260a2':
Import translations. DO NOT MERGE
Change-Id: I221cce3b46e062e60f4439ead38a97aa561d6edc
Bill Yi [Fri, 3 Jun 2016 23:45:47 +0000 (16:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I98fcef7d96fe6957419e34bdb4357e254d8e6fc0
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 23:42:34 +0000 (16:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: If896174730ea6a12d1d591aadf2eff5047d2e60a
Auto-generated-cl: translation import
Marie Janssen [Thu, 2 Jun 2016 22:10:36 +0000 (22:10 +0000)]
Merge "Check exception to prevent crash on invalid URIs am:
eacf805631 am:
8c6f71ddc0" into nyc-mr1-dev-plus-aosp
am:
348ba14d79
* commit '
348ba14d79e3902592ebfbb54d428cd6cd573d54':
Change-Id: If52680229806f72c1cb9c4d2c5b553ab33dab2b8
Marie Janssen [Thu, 2 Jun 2016 22:10:36 +0000 (22:10 +0000)]
Check exception to prevent crash on invalid URIs am:
eacf805631 am:
397d80ad96
am:
239cf0ec7d
* commit '
239cf0ec7dd507549817826cb717ee7272de994b':
Check exception to prevent crash on invalid URIs
Change-Id: Id5e4b03dd4a8b10a6a10eaaa39088617902b4fe2
Android Build Merger (Role) [Thu, 2 Jun 2016 22:08:23 +0000 (22:08 +0000)]
Merge "Check exception to prevent crash on invalid URIs am:
eacf805631 am:
8c6f71ddc0" into nyc-mr1-dev-plus-aosp
Marie Janssen [Thu, 2 Jun 2016 22:08:11 +0000 (22:08 +0000)]
Check exception to prevent crash on invalid URIs am:
eacf805631
am:
397d80ad96
* commit '
397d80ad96fa265c5c506948665846f9b9fa3d65':
Check exception to prevent crash on invalid URIs
Change-Id: I5b51c507f7c2835d8d00fa7ae7d828d372c42ac5
Marie Janssen [Thu, 2 Jun 2016 22:08:11 +0000 (22:08 +0000)]
Check exception to prevent crash on invalid URIs am:
eacf805631
am:
8c6f71ddc0
* commit '
8c6f71ddc0b760a66f4aef6cc32d3a3538aaf496':
Check exception to prevent crash on invalid URIs
Change-Id: I2605f2af354a36a8bb23be6e173195da03939d2c
Marie Janssen [Thu, 2 Jun 2016 22:05:45 +0000 (22:05 +0000)]
Check exception to prevent crash on invalid URIs
am:
eacf805631
* commit '
eacf805631c3fb557ba7210dc6da3eb4dd1a04b2':
Check exception to prevent crash on invalid URIs
Change-Id: I0b656810f5165dde186fc80a47eb5c4339ef8a66
Marie Janssen [Thu, 2 Jun 2016 22:05:45 +0000 (22:05 +0000)]
Check exception to prevent crash on invalid URIs
am:
eacf805631
* commit '
eacf805631c3fb557ba7210dc6da3eb4dd1a04b2':
Check exception to prevent crash on invalid URIs
Change-Id: I6c697a50c6078ba89f0f5bd0018ddcf99ef869d2
Mudumba Ananth [Thu, 2 Jun 2016 10:55:27 +0000 (10:55 +0000)]
HFP 1.7 profile update (4/4) am:
2ab50a41da
am:
0ca488af56
* commit '
0ca488af56810000261737b86fafda89bf051a20':
HFP 1.7 profile update (4/4)
Change-Id: I379f1c4387207ec63556d81af4e32101f5dcc5ec
Mudumba Ananth [Thu, 2 Jun 2016 10:36:28 +0000 (10:36 +0000)]
HFP 1.7 profile update (4/4)
am:
2ab50a41da
* commit '
2ab50a41dac634a78cef60a419c3bcc848c1aa78':
HFP 1.7 profile update (4/4)
Change-Id: I8e544dd7e3e68dd6c7c246db675474488aa77be2
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
Bill Yi [Wed, 1 Jun 2016 02:11:43 +0000 (19:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic66606eb884fab4c16e264e54b957ca43251388a
Auto-generated-cl: translation import
Marie Janssen [Wed, 25 May 2016 21:27:00 +0000 (14:27 -0700)]
Check exception to prevent crash on invalid URIs
Previously if an invalid URI for a notification is received,
Bluetooth crashed.
Bug:
28940687
Change-Id: I54e17b7180e770bb8a5cf48c3d4b2a35657cb67f
Bill Yi [Tue, 31 May 2016 02:38:58 +0000 (19:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia2e9673f0e7e5b7d7ca362f432d19894832cfa17
Auto-generated-cl: translation import
Marie Janssen [Wed, 25 May 2016 21:27:00 +0000 (14:27 -0700)]
Check exception to prevent crash on invalid URIs
Previously if an invalid URI for a notification is received,
Bluetooth crashed.
Bug:
28940687
Change-Id: I54e17b7180e770bb8a5cf48c3d4b2a35657cb67f
rongbo.x.chi [Wed, 25 May 2016 00:43:15 +0000 (00:43 +0000)]
Only allow access to MAP if SMS is not supported am:
4d2c98fcf1 am:
b1a7dbf860
am:
0af30005d8
* commit '
0af30005d8a7e1a22084e7fbf2b43490c91f3b1f':
Change-Id: I01e6a89ec6b2ca545284a673a11699e212981b1f
rongbo.x.chi [Wed, 25 May 2016 00:43:13 +0000 (00:43 +0000)]
Only allow access to MAP if SMS is not supported am:
4d2c98fcf1 am:
cd42dafa7b
am:
94c3a2bffa
* commit '
94c3a2bffa5f6c0979e95bca7eee95f0d92ae632':
Only allow access to MAP if SMS is not supported
Change-Id: I13d3080a986512776639a95045a383cfcbf95d56
Pavlin Radoslavov [Wed, 25 May 2016 00:43:11 +0000 (00:43 +0000)]
Merge "Removed unnecessary "synchronized" statements" am:
5d573d5b69 am:
58ae9847b3 am:
1e68050081
am:
2c63a0722b
* commit '
2c63a0722bd9d2c3882bf6b3e2cfc4f84b2f03ce':
Removed unnecessary "synchronized" statements
Change-Id: I0e39a5edd2680ab626bd1576cee643e747ad7081
rongbo.x.chi [Wed, 25 May 2016 00:35:16 +0000 (00:35 +0000)]
Only allow access to MAP if SMS is not supported am:
4d2c98fcf1
am:
b1a7dbf860
* commit '
b1a7dbf860fc3a66113fce83c64fe23aacdd311c':
Change-Id: I0ee7978591bbab201e4bef4be33896c8f4605217
rongbo.x.chi [Wed, 25 May 2016 00:31:03 +0000 (00:31 +0000)]
Only allow access to MAP if SMS is not supported am:
4d2c98fcf1
am:
cd42dafa7b
* commit '
cd42dafa7b46ed7add0705862632fdf70e9e19a9':
Only allow access to MAP if SMS is not supported
Change-Id: I56704c020b97401e63876ca303c7879dcd9e5b58
Pavlin Radoslavov [Wed, 25 May 2016 00:30:59 +0000 (00:30 +0000)]
Merge "Removed unnecessary "synchronized" statements" am:
5d573d5b69 am:
58ae9847b3
am:
1e68050081
* commit '
1e68050081902a40faf443c33c9f442a7e41ec90':
Removed unnecessary "synchronized" statements
Change-Id: Idc4e380970f18c693b177d85b0c6f33c898673f1
rongbo.x.chi [Wed, 25 May 2016 00:27:29 +0000 (00:27 +0000)]
Only allow access to MAP if SMS is not supported
am:
4d2c98fcf1
* commit '
4d2c98fcf1abc4b07dc2d4601952f30f5d008470':
Only allow access to MAP if SMS is not supported
Change-Id: I33a25eb06427b65297cb72fac7c7325dec0e2067
rongbo.x.chi [Wed, 25 May 2016 00:27:28 +0000 (00:27 +0000)]
Only allow access to MAP if SMS is not supported
am:
4d2c98fcf1
* commit '
4d2c98fcf1abc4b07dc2d4601952f30f5d008470':
Only allow access to MAP if SMS is not supported
Change-Id: If15223d47b3c56297aa7289d71dc23b18816275a
Pavlin Radoslavov [Wed, 25 May 2016 00:26:49 +0000 (00:26 +0000)]
Merge "Removed unnecessary "synchronized" statements" am:
5d573d5b69
am:
58ae9847b3
* commit '
58ae9847b35b4a5d20f82b02ba396eb3d7790a99':
Removed unnecessary "synchronized" statements
Change-Id: I97f18ab10590fe10f1cfa2deeae915f447e6de23
Pavlin Radoslavov [Tue, 24 May 2016 23:27:50 +0000 (23:27 +0000)]
Merge "Removed unnecessary "synchronized" statements"
am:
5d573d5b69
* commit '
5d573d5b69dd6b339a2f26627065e4398266d072':
Removed unnecessary "synchronized" statements
Change-Id: I9c5750be40991984dfc9a8415618f24d519a1048
Treehugger Robot [Tue, 24 May 2016 23:17:36 +0000 (23:17 +0000)]
Merge "Removed unnecessary "synchronized" statements"
rongbo.x.chi [Mon, 7 Dec 2015 08:42:18 +0000 (16:42 +0800)]
Only allow access to MAP if SMS is not supported
Bluetooth MAP shows SMS/MMS instance and when SMS is not supported.
Don't create SMS/MMS instance if device does not support SMS.
Fixes:
28803983
Change-Id: I807fe7e10bf51316729fe56ff6181a9161a410ef
Ajay Panicker [Tue, 24 May 2016 22:33:15 +0000 (22:33 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3 am:
5b68598a5f am:
4b1a2258f7 am:
996e934491 am:
144643c798
am:
f49cfe55ed
* commit '
f49cfe55ed074819d359c8623978a5f7f2192bf0':
Change-Id: I7c953c876743cbddd7a65b70bb71de39da1dedc1
Ajay Panicker [Tue, 24 May 2016 22:33:15 +0000 (22:33 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3 am:
5b68598a5f am:
4b1a2258f7 am:
996e934491 am:
0dd27d8862
am:
ba646866b5
* commit '
ba646866b5a30e9c0491de5545ecd30e710a354d':
Add guest mode functionality (3/3)
Change-Id: I62cfe2f4339ecae8bdc7a3255b1471964c0355eb
Ajay Panicker [Tue, 24 May 2016 22:32:21 +0000 (22:32 +0000)]
Merge "Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours am:
1d6901fdcf am:
749752db0d am:
24bbc49362 am:
bc8291e9bf" into nyc-mr1-dev-plus-aosp
am:
ece8d9bce2
* commit '
ece8d9bce24aa0e1f5814068f23f6c5e8accb7e7':
Change-Id: Ida93d173160122f7901e3bda014f51ace3244ba8
Ajay Panicker [Tue, 24 May 2016 22:32:15 +0000 (22:32 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours am:
1d6901fdcf am:
749752db0d am:
24bbc49362 am:
76c07448f3
am:
c9d41b23a7
* commit '
c9d41b23a78f44ca32c1f08aa5e8119cb395f6d9':
Add guest mode functionality (3/3)
Change-Id: I8461f46f93a4941d9c7f2dac70ab81d6eedbb1d9
Ajay Panicker [Tue, 24 May 2016 22:30:17 +0000 (22:30 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3 am:
5b68598a5f am:
4b1a2258f7 am:
996e934491
am:
144643c798
* commit '
144643c7989bdfdddf1b21ec1f646d0499e5d023':
Change-Id: I5ecc87f0f71e012be6b143626f4c77a0f5d7d363
Ajay Panicker [Tue, 24 May 2016 22:30:02 +0000 (22:30 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3 am:
5b68598a5f am:
4b1a2258f7 am:
996e934491
am:
0dd27d8862
* commit '
0dd27d8862a9a7a2e2f58ea3f812c7e301c4194f':
Add guest mode functionality (3/3)
Change-Id: I55dd9e09102c4729a547074845e4bc56ad16603e
Android Build Merger (Role) [Tue, 24 May 2016 22:29:52 +0000 (22:29 +0000)]
Merge "Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours am:
1d6901fdcf am:
749752db0d am:
24bbc49362 am:
bc8291e9bf" into nyc-mr1-dev-plus-aosp
Ajay Panicker [Tue, 24 May 2016 22:29:36 +0000 (22:29 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours am:
1d6901fdcf am:
749752db0d am:
24bbc49362
am:
bc8291e9bf
* commit '
bc8291e9bf1d881f76338c2a13c1c1673fff9286':
Add guest mode functionality (3/3)
Change-Id: I756a248ba3394ecc997efcfd8457b77f6d70b866
Ajay Panicker [Tue, 24 May 2016 22:29:34 +0000 (22:29 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours am:
1d6901fdcf am:
749752db0d am:
24bbc49362
am:
76c07448f3
* commit '
76c07448f3aea52e093cd9687c37fc0642f10cb4':
Add guest mode functionality (3/3)
Change-Id: If3459d86e0d65a21e13e06f1170c7f357dfc260d
Ajay Panicker [Tue, 24 May 2016 22:27:40 +0000 (22:27 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3 am:
5b68598a5f am:
4b1a2258f7
am:
996e934491
* commit '
996e934491359a490a95f510da6f9eca6e684918':
Add guest mode functionality (3/3)
Change-Id: Icb7cf37c3be37ad276a678a26c5008126937c7fa
Ajay Panicker [Tue, 24 May 2016 22:27:38 +0000 (22:27 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3 am:
5b68598a5f am:
4b1a2258f7
am:
996e934491
* commit '
996e934491359a490a95f510da6f9eca6e684918':
Add guest mode functionality (3/3)
Change-Id: I1fc9922c46d768c0cc69b875c1a83bd44248aa43
Ajay Panicker [Tue, 24 May 2016 22:26:53 +0000 (22:26 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours am:
1d6901fdcf am:
749752db0d
am:
24bbc49362
* commit '
24bbc4936234ba42ef38c14d0f7c2174b98b1792':
Add guest mode functionality (3/3)
Change-Id: I1f07c3966954139f49a49d2f39cee93130b91343
Ajay Panicker [Tue, 24 May 2016 22:26:50 +0000 (22:26 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours am:
1d6901fdcf am:
749752db0d
am:
24bbc49362
* commit '
24bbc4936234ba42ef38c14d0f7c2174b98b1792':
Add guest mode functionality (3/3)
Change-Id: I47282efc33a5d9f7a7cd05dd57efb2af2aa8ca46
Ajay Panicker [Tue, 24 May 2016 22:26:00 +0000 (22:26 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3 am:
5b68598a5f
am:
4b1a2258f7
* commit '
4b1a2258f7b811312ddefb1af62a87544f574ab1':
Add guest mode functionality (3/3)
Change-Id: I0a69c7db93c9f510985107e31609c9b45dc3698f
Ajay Panicker [Tue, 24 May 2016 22:25:26 +0000 (22:25 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours am:
1d6901fdcf
am:
749752db0d
* commit '
749752db0d737e47f59347f01e9c304608f63e27':
Add guest mode functionality (3/3)
Change-Id: I8e8327d41c0ee3d6b6ed1c68b7517aca44dfab66
Ajay Panicker [Tue, 24 May 2016 22:21:47 +0000 (22:21 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3
am:
5b68598a5f
* commit '
5b68598a5f4e0bef1ee87671617be8476dbf30a6':
Add guest mode functionality (3/3)
Change-Id: Ib4ea170b03af67655426ab030032aeb36342f6ba
Ajay Panicker [Tue, 24 May 2016 22:21:27 +0000 (22:21 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours
am:
1d6901fdcf
* commit '
1d6901fdcf7e546b3bdbeb1bc1b9c1cae3688745':
Add guest mode functionality (3/3)
Change-Id: If3aaa4e34c015da99d38e984d8b0dd1bedd2e1f3
Ajay Panicker [Tue, 24 May 2016 22:16:17 +0000 (22:16 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea
am:
46790a61d3
* commit '
46790a61d3722128f68bbfd2e12656923def72d0':
Add guest mode functionality (3/3)
Change-Id: I956eb988a5f80ff11af426a406251a852eb1a09a
Ajay Panicker [Tue, 24 May 2016 22:16:04 +0000 (22:16 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours
am:
6d74162bea
* commit '
6d74162bea2771991a434e0c463b58c080ee1b26':
Add guest mode functionality (3/3)
Change-Id: I90e7d0a5372f25eeb2a92f8773aa81caa3d1de1f
Ajay Panicker [Tue, 24 May 2016 22:15:53 +0000 (22:15 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da
am:
69689c0098 -s ours
* commit '
69689c0098a7582f8bba393f72b2575ed5508e71':
Add guest mode functionality (3/3)
Change-Id: I0715575a2e7de20356c1b8c0b170eb85eb5e77e3
Ajay Panicker [Tue, 24 May 2016 22:13:11 +0000 (22:13 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002
am:
0b2a403b82 -s ours
* commit '
0b2a403b821149b8d0c6ec3ab28db46beff3d75e':
Add guest mode functionality (3/3)
Change-Id: Ic32d37360b9a73b10b27bed3a73d9fdf865db346
Ajay Panicker [Tue, 24 May 2016 22:07:27 +0000 (22:07 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641
am:
b01d679002
* commit '
b01d6790028caf2ba951d5c6eeacf7d4f8ecbbd3':
Add guest mode functionality (3/3)
Change-Id: I98de45cdc87a200c4ff32ccfac88d42edac767a5
Ajay Panicker [Tue, 24 May 2016 22:05:26 +0000 (22:05 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6
am:
480b762641
* commit '
480b76264134b6a44aef6948f32b4bd6a62fcd0f':
Add guest mode functionality (3/3)
Change-Id: I512cef0d0c23d4702cf9de61be4bf8f47c164bac
Ajay Panicker [Tue, 24 May 2016 22:02:02 +0000 (22:02 +0000)]
Add guest mode functionality (3/3)
am:
af5b1764da
* commit '
af5b1764daa3b212d471f000d7091ac07c040453':
Add guest mode functionality (3/3)
Change-Id: I2591d37bb52e2bda796200100f7f21bf00f55d7a
Ajay Panicker [Tue, 24 May 2016 22:02:02 +0000 (22:02 +0000)]
Add guest mode functionality (3/3)
am:
e1ca5cccd6
* commit '
e1ca5cccd6c2b37f783aa0ee2d9371108ad5c855':
Add guest mode functionality (3/3)
Change-Id: I9f3c034215aadf5e5ebd77e4a3265c7fbcf21fe3
Alain Vongsouvanh [Tue, 24 May 2016 16:37:44 +0000 (16:37 +0000)]
Merge "GATT: Move connection parameters to config.xml" into nyc-mr1-dev am:
30a5b9153f
am:
869099e1bc
* commit '
869099e1bc6859155752b06e4110ddd2b44913aa':
GATT: Move connection parameters to config.xml
Change-Id: Ieb6011cdd63a7bbf7969c56ac9ea471b945e29dd
Alain Vongsouvanh [Tue, 24 May 2016 16:28:16 +0000 (16:28 +0000)]
Merge "GATT: Move connection parameters to config.xml" into nyc-mr1-dev
am:
30a5b9153f
* commit '
30a5b9153f8154c72d877a56e57b257dbfa27c50':
GATT: Move connection parameters to config.xml
Change-Id: Ifc767f506ce7d1be8e07584ad91dcad26ae12a39
Alain Vongsouvanh [Tue, 24 May 2016 16:09:52 +0000 (16:09 +0000)]
Merge "GATT: Move connection parameters to config.xml" into nyc-mr1-dev
Pavlin Radoslavov [Mon, 23 May 2016 05:24:08 +0000 (22:24 -0700)]
Removed unnecessary "synchronized" statements
Bug:
28734075
Bug:
28799467
Change-Id: I6ba8867c179dc416bb0dd06c69ce426c10ea7585
(cherry picked from commit
e741f05c93343241123095acab011dc8a0700bc6)
Pavlin Radoslavov [Tue, 24 May 2016 02:41:58 +0000 (02:41 +0000)]
Merge "Removed unnecessary "synchronized" statements am:
e741f05c93 am:
628d48f520" into nyc-mr1-dev-plus-aosp
am:
25f32feab5
* commit '
25f32feab5f9d1dc22fc8bb833c0b7630db25b58':
Change-Id: I84ca43629af49708de3e08660f74ef34b97aa013
OSDN Git Service
