OSDN Git Service
Bill Yi [Mon, 21 Nov 2016 01:53:18 +0000 (01:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
81abcfea7b -s ours
Change-Id: I79c577d14b2953e44d9152a8179e3ce441c3cfe2
Bill Yi [Mon, 21 Nov 2016 01:53:15 +0000 (01:53 +0000)]
Import translations. DO NOT MERGE
am:
521b3d5259 -s ours
Change-Id: I5e78af63df907a988e289ce1e0514d97e41ffe2f
Bill Yi [Mon, 21 Nov 2016 01:51:48 +0000 (01:51 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
f94b944f80 -s ours
Change-Id: I80015e96b7658dc3d2a94f33637422b413c285e2
Bill Yi [Mon, 21 Nov 2016 01:51:44 +0000 (01:51 +0000)]
Import translations. DO NOT MERGE
am:
149b6ede65 -s ours
Change-Id: I32c82c89f6cf403acea70138bd3f4635ce9e951e
Bill Yi [Mon, 21 Nov 2016 01:45:26 +0000 (01:45 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
577b77a87a -s ours
Change-Id: Ida1b49e4ed6d460b72490bc08ca37c9cc9919203
Bill Yi [Mon, 21 Nov 2016 01:45:23 +0000 (01:45 +0000)]
Import translations. DO NOT MERGE
am:
a54b679f2a -s ours
Change-Id: If4a6fe668a70c13ea264e07daec3798fe1a93111
Bill Yi [Mon, 21 Nov 2016 01:43:57 +0000 (01:43 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
a4c8fe82e8 -s ours
Change-Id: I05649b68ffbb0480610b3b886391e0855eddc255
Bill Yi [Mon, 21 Nov 2016 01:43:53 +0000 (01:43 +0000)]
Import translations. DO NOT MERGE
am:
484b776b78 -s ours
Change-Id: Ic56f4bcd826deef996537357455fe5ee07c3033e
Bill Yi [Mon, 21 Nov 2016 01:42:27 +0000 (01:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
9fb559183f -s ours
Change-Id: If271b83e04c4d9da243620bbc96cd97c8ccb6db8
Bill Yi [Mon, 21 Nov 2016 01:42:24 +0000 (01:42 +0000)]
Import translations. DO NOT MERGE
am:
44fc3e0900 -s ours
Change-Id: I5dd8681354b2d2c0301875412efab6e75e46dca5
Bill Yi [Mon, 21 Nov 2016 01:40:54 +0000 (01:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
c3ba50cc48 -s ours
Change-Id: If4403a39868db9acb2eeed244be17be166790294
Bill Yi [Mon, 21 Nov 2016 01:40:51 +0000 (01:40 +0000)]
Import translations. DO NOT MERGE
am:
3b4e128814 -s ours
Change-Id: I327bc8ce6849398dd59a26247c3499e7a0cea9c6
Bill Yi [Mon, 21 Nov 2016 01:39:22 +0000 (01:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
0b555bb27d -s ours
Change-Id: I1c362fc4464289cf62ed06c9cae32e10a08f1206
Bill Yi [Mon, 21 Nov 2016 01:39:18 +0000 (01:39 +0000)]
Import translations. DO NOT MERGE
am:
5e7d7e48f0 -s ours
Change-Id: I329a247ad575f79807c6674783f3dc5ee454c076
Bill Yi [Mon, 21 Nov 2016 01:37:45 +0000 (01:37 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
e450219549 -s ours
Change-Id: Icc5d61744d217501d5ecd328f3203bc11e7d54d2
Bill Yi [Mon, 21 Nov 2016 01:37:42 +0000 (01:37 +0000)]
Import translations. DO NOT MERGE
am:
a45b9aa91a -s ours
Change-Id: Idea311e27df5d5c0f51b354582994eecb07fd5dd
Bill Yi [Mon, 21 Nov 2016 01:36:14 +0000 (01:36 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
2b8d4b588a -s ours
Change-Id: If78dc2dea18addf87ecec09118d0a1284c265fd5
Bill Yi [Mon, 21 Nov 2016 01:36:10 +0000 (01:36 +0000)]
Import translations. DO NOT MERGE
am:
aa73b0a72f -s ours
Change-Id: I1ad3286634a2ec52cb1cc51d9f33750c6278855f
Bill Yi [Mon, 21 Nov 2016 01:34:37 +0000 (01:34 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
d0220f7863 -s ours
Change-Id: I0065f8bdf061cd032ba4cf6fc54ca494da369a31
Bill Yi [Mon, 21 Nov 2016 01:34:34 +0000 (01:34 +0000)]
Import translations. DO NOT MERGE
am:
18935bdfc9 -s ours
Change-Id: I75043944a7acfcf1c349adfcec764e1fbbf4e0b0
Bill Yi [Mon, 21 Nov 2016 01:33:32 +0000 (01:33 +0000)]
Import translations. DO NOT MERGE
am:
ca112cfaeb -s ours
Change-Id: I259f0c5f68a89c27ba68d7721efe67a5f12ca186
TreeHugger Robot [Mon, 21 Nov 2016 01:30:03 +0000 (01:30 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:29:44 +0000 (01:29 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:29:13 +0000 (01:29 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:28:40 +0000 (01:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:28:21 +0000 (01:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:27:55 +0000 (01:27 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:27:22 +0000 (01:27 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:26:51 +0000 (01:26 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:26:05 +0000 (01:26 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 21 Nov 2016 01:23:55 +0000 (01:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 20 Nov 2016 23:49:28 +0000 (15:49 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Ia328721b05af6cfe32f4494e89f6ee1645cb1deb
Bill Yi [Sun, 20 Nov 2016 23:43:22 +0000 (15:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: I102b129ace5c7d97a6874aad995930b2f3cbdae6
Bill Yi [Sun, 20 Nov 2016 22:46:30 +0000 (14:46 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: I8f62ab1cb184f32e850831414c8ff3e7740d783f
Bill Yi [Sun, 20 Nov 2016 22:43:23 +0000 (14:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Ic5781e21dceb885251e8ed7696a309e1844d9bd6
Bill Yi [Sun, 20 Nov 2016 22:18:34 +0000 (14:18 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Iad7637d1a9f10f5641f089db9542734be4da0d2e
Bill Yi [Sun, 20 Nov 2016 22:15:31 +0000 (14:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Ia301c54a58d496c9608939c12e18491d3c4df1f6
Bill Yi [Sun, 20 Nov 2016 22:12:16 +0000 (14:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Ic71ef1faaf60206410b376e09daa2ad98c91d259
Bill Yi [Sun, 20 Nov 2016 22:09:05 +0000 (14:09 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: I3a874ee9fdb4b34f2db64447c6e5d74e25c06634
Bill Yi [Sun, 20 Nov 2016 22:01:26 +0000 (14:01 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Ie0dcafdd0f6a197f33c9422e16fb1a03137b73b3
Bill Yi [Sun, 20 Nov 2016 21:52:54 +0000 (13:52 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Ia40da4b009f43aa51b2b7d3acdccc7552e2b35d0
Bill Yi [Sun, 20 Nov 2016 21:47:25 +0000 (13:47 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: I2ded2e0fc6589e569e2de2f4d042f68c1cd0b63e
Yifan Hong [Fri, 18 Nov 2016 23:29:05 +0000 (23:29 +0000)]
Merge "Split libhidl into base and transport." am:
c6c005ef5b
am:
06025dc947
Change-Id: I20fbea0d4d4dc3908f962007df3e3509c054be68
Yifan Hong [Fri, 18 Nov 2016 23:23:08 +0000 (23:23 +0000)]
Merge "Split libhidl into base and transport."
am:
c6c005ef5b
Change-Id: Ia0017e01d650383a709952c86012dc958d93b794
Yifan Hong [Fri, 18 Nov 2016 23:20:38 +0000 (23:20 +0000)]
Split libhidl into base and transport. am:
c46d1b44eb
am:
78f6a7c615
Change-Id: I95471e3f90ba796b52c3df555b60ad6f49aae5da
Yifan Hong [Fri, 18 Nov 2016 23:14:27 +0000 (23:14 +0000)]
Split libhidl into base and transport.
am:
c46d1b44eb
Change-Id: I0bcf04338d71386249de46c015b0e577c47c6e79
Treehugger Robot [Fri, 18 Nov 2016 23:08:55 +0000 (23:08 +0000)]
Merge "Split libhidl into base and transport."
Wan He [Fri, 18 Nov 2016 22:48:28 +0000 (22:48 +0000)]
Merge "Fix incorrect calculation of sizeof package structure" am:
757e286cc8
am:
530fdccbe4
Change-Id: I92417758a165741a4346d6b6c3f3491776b86729
Wan He [Fri, 18 Nov 2016 22:39:43 +0000 (22:39 +0000)]
Merge "Fix incorrect calculation of sizeof package structure"
am:
757e286cc8
Change-Id: Ia16ee8f4efaee3e43c656f753c878b13b4a4706c
Treehugger Robot [Fri, 18 Nov 2016 22:30:41 +0000 (22:30 +0000)]
Merge "Fix incorrect calculation of sizeof package structure"
Mats 2, Ã…kesson [Fri, 18 Nov 2016 20:56:03 +0000 (20:56 +0000)]
Merge "Customization of LTE Signal Bars" am:
3cbf2c2657
am:
5ee2b9384b
Change-Id: I82d61b23560e4bdf84caca7e49ddcd367662cb47
Mats 2, Ã…kesson [Fri, 18 Nov 2016 20:50:20 +0000 (20:50 +0000)]
Merge "Customization of LTE Signal Bars"
am:
3cbf2c2657
Change-Id: I33c625ec49547fde582462687e6229ddf0269b15
Treehugger Robot [Fri, 18 Nov 2016 20:44:14 +0000 (20:44 +0000)]
Merge "Customization of LTE Signal Bars"
Selim Cinek [Fri, 18 Nov 2016 19:57:20 +0000 (19:57 +0000)]
Merge "Share one receiver for CurrentUserTracker" am:
06d619ccfa
am:
a84c7ea396
Change-Id: I54ca8022b6aeb15329d7a432300eaa758ea4b8ac
Selim Cinek [Fri, 18 Nov 2016 19:56:27 +0000 (19:56 +0000)]
Merge "Brightness mirror - fix multi-touch issue" am:
1bfab3de31
am:
44857962dc
Change-Id: Ie5f7a865b3ed1d17444b5133ad530ae6191294a9
Selim Cinek [Fri, 18 Nov 2016 19:51:23 +0000 (19:51 +0000)]
Merge "Share one receiver for CurrentUserTracker"
am:
06d619ccfa
Change-Id: I4b0dc5398b0be804663ebd633070a38cc51ec7de
Selim Cinek [Fri, 18 Nov 2016 19:50:27 +0000 (19:50 +0000)]
Merge "Brightness mirror - fix multi-touch issue"
am:
1bfab3de31
Change-Id: I5906d89a1c4e1343dbdbf99f328a5356b4f2be85
Selim Cinek [Fri, 18 Nov 2016 19:39:30 +0000 (19:39 +0000)]
Merge "Share one receiver for CurrentUserTracker"
Selim Cinek [Fri, 18 Nov 2016 19:39:09 +0000 (19:39 +0000)]
Merge "Brightness mirror - fix multi-touch issue"
Peter Qiu [Fri, 18 Nov 2016 08:59:09 +0000 (08:59 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration" am:
ebb722d04a
am:
8bbb583ff7
Change-Id: I50cd0f4c92b30cd649626dad1a1288619d6b03e5
Peter Qiu [Fri, 18 Nov 2016 08:54:11 +0000 (08:54 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration"
am:
ebb722d04a
Change-Id: Ic20a77103961bd9ff61b6af90130c25ad19c451a
Treehugger Robot [Fri, 18 Nov 2016 08:45:15 +0000 (08:45 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration"
Chris Tate [Fri, 18 Nov 2016 01:38:05 +0000 (01:38 +0000)]
Merge "Schedule agentDisconnected() in handler thread" am:
c02a4a4613
am:
72a838e704
Change-Id: I2eda02ea14fb67b1a0192750ae3885ec89f14564
Chris Tate [Fri, 18 Nov 2016 01:33:29 +0000 (01:33 +0000)]
Merge "Schedule agentDisconnected() in handler thread"
am:
c02a4a4613
Change-Id: I1e2da0be53678a791dd16be5d00caa5e712fa036
Chris Tate [Fri, 18 Nov 2016 01:23:31 +0000 (01:23 +0000)]
Merge "Schedule agentDisconnected() in handler thread"
John Reck [Fri, 18 Nov 2016 00:28:54 +0000 (00:28 +0000)]
Merge "Avoid starving RT anims" am:
f77c220aa9
am:
7269372d5f
Change-Id: Ife1e7ea95055d8179b4a622dc4dabce382575b5b
John Reck [Fri, 18 Nov 2016 00:14:05 +0000 (00:14 +0000)]
Merge "Avoid starving RT anims"
am:
f77c220aa9
Change-Id: I3d4ba24ae0e6de4683d47163fd8f3bf65b98bd17
Yifan Hong [Wed, 16 Nov 2016 23:48:49 +0000 (15:48 -0800)]
Split libhidl into base and transport.
Bug:
32756130
Test: mma
Change-Id: I0df309a1096b663cc51ce8badacf05e2a47836a8
Treehugger Robot [Thu, 17 Nov 2016 23:52:59 +0000 (23:52 +0000)]
Merge "Avoid starving RT anims"
John Reck [Tue, 15 Nov 2016 18:22:01 +0000 (10:22 -0800)]
Avoid starving RT anims
Test: Manual, usleep(16000) in DrawFrameTask and tap
on recents
Merged-In: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
Change-Id: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
Brad Ebinger [Thu, 17 Nov 2016 19:35:08 +0000 (19:35 +0000)]
Merge "Readability improvements in Logging" am:
d51df736f6
am:
90b6e78657
Change-Id: I51e87f2a8146e1e60d3610bbdc791b40fc8ba972
Brad Ebinger [Thu, 17 Nov 2016 19:29:17 +0000 (19:29 +0000)]
Merge "Readability improvements in Logging"
am:
d51df736f6
Change-Id: If7bb6955d615b8369ac41d3bb8ba96aa0cc752d2
Brad Ebinger [Thu, 17 Nov 2016 19:18:00 +0000 (19:18 +0000)]
Merge "Readability improvements in Logging"
Dimitry Ivanov [Thu, 17 Nov 2016 18:57:58 +0000 (18:57 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper" am:
f68cb55cc1
am:
6a5e1a7f4a
Change-Id: I096fb9b30c2e11bf7054aefa1bd3deb6974a9d36
Dimitry Ivanov [Thu, 17 Nov 2016 18:50:29 +0000 (18:50 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper"
am:
f68cb55cc1
Change-Id: I06e1b8acbe6772ea80bb9c6ab6704e6ce678c3cc
Treehugger Robot [Thu, 17 Nov 2016 18:37:41 +0000 (18:37 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper"
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:49:22 +0000 (15:49 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am:
caa816451c
am:
d771b36951
Change-Id: Ia37618f5de09faa89f2ed421eae0760118c1483e
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:41:57 +0000 (15:41 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
am:
caa816451c
Change-Id: I43c66260714bb312e270bfbae1c74047e6ef01e4
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:28:52 +0000 (15:28 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
Wan He [Thu, 17 Nov 2016 09:49:37 +0000 (17:49 +0800)]
Fix incorrect calculation of sizeof package structure
Argument "package" is a pointer, not the structure.
Signed-off-by: Wan He <xiaolin.gxl@alibaba-inc.com>
Pavlin Radoslavov [Thu, 17 Nov 2016 07:16:13 +0000 (07:16 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device" am:
3ebcf1218b
am:
c15cc348e8
Change-Id: I0754321d2e289b4c6d2d64a00d13a2d9c2bfcf1c
Pavlin Radoslavov [Thu, 17 Nov 2016 07:07:20 +0000 (07:07 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device"
am:
3ebcf1218b
Change-Id: Ibbf94535642bbde6e35ee1dacbd27dd13f400f16
Treehugger Robot [Thu, 17 Nov 2016 06:58:42 +0000 (06:58 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device"
Pavlin Radoslavov [Thu, 17 Nov 2016 04:51:06 +0000 (20:51 -0800)]
Don't disconnect an A2DP device when connecting to same device
When processing a connect request for an A2DP device, Settings
would trigger a disconnect request for all A2DP devices that
have state of CONNECTED, CONNECTING or DISCONNECTING, including
eventually the device we are connecting to.
This could create timing-related issues, and is not necessary.
Now we explicitly check to avoid disconnecting the device we are
connecting to.
Test: Manual A2DP testing with a phone and wireless headsets
Bug:
32688022
Change-Id: I572dd87c071829b734513c4b928a4d65fe539520
Dimitry Ivanov [Thu, 17 Nov 2016 02:28:04 +0000 (18:28 -0800)]
Fix coretests: Remove dependency on libnativehelper
This dependency was never needed and it makes test app
depend on private platform libraries - which is no longer allowed.
This change fixes these problems by removing dependency and renaming
JNI method.
Test: Install the test and start it.
Change-Id: I9878627148917c1b5928b98f3c86f6e6097093d6
Peter Qiu [Thu, 17 Nov 2016 02:28:13 +0000 (02:28 +0000)]
Merge "wifi: add constant definition for EAP types" am:
a908e65b66
am:
40dfd2d0bc
Change-Id: I155c39131c820cf7eb77ee8b9bb2b51b3eed3d08
Peter Qiu [Thu, 17 Nov 2016 02:21:41 +0000 (02:21 +0000)]
Merge "wifi: add constant definition for EAP types"
am:
a908e65b66
Change-Id: I283fba81ca5246222bda07f7f109d2f359e5e395
Treehugger Robot [Thu, 17 Nov 2016 02:10:23 +0000 (02:10 +0000)]
Merge "wifi: add constant definition for EAP types"
dooyoung.hwang [Fri, 11 Nov 2016 08:23:00 +0000 (17:23 +0900)]
Share one receiver for CurrentUserTracker
Each CurrentUserTracker has one receiver per one object.
This could cause unnecessary transaction as Tracker counts
increases. The idea of redcuing receiver is creating
one static receiver for CurrentUserTracker and share it
with all object.
Test: Check if Quicksetting order is changed properly
after switching user.
Change-Id: I8404829826391f8b315b42bbd0f50e77b783eeab
Jerry Zhang [Thu, 17 Nov 2016 00:36:52 +0000 (00:36 +0000)]
Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am:
b37d826204
am:
1faf15d422
Change-Id: I00ab9ec389091e0616aa313825a8d3f0d7963eff
Jerry Zhang [Thu, 17 Nov 2016 00:24:41 +0000 (00:24 +0000)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method. am:
935372bfd6
am:
5cbd151d40
Change-Id: Ie2920ff5a89c5eee28a31803f9775920289e41c4
Jerry Zhang [Thu, 17 Nov 2016 00:23:47 +0000 (00:23 +0000)]
Clean up persistent usb state on boot. am:
dfacad026d
am:
b15490ac4d
Change-Id: I2fd38cd6b27685206f6aa5f11daecbc7654749d1
Jerry Zhang [Thu, 17 Nov 2016 00:22:59 +0000 (00:22 +0000)]
Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
am:
b37d826204
Change-Id: Id5e28b59858b16c1cfde16104feb54f2a101e366
Jerry Zhang [Thu, 17 Nov 2016 00:22:53 +0000 (00:22 +0000)]
Fixed handling of usb state during adb changes. am:
0269ebe0fe
am:
4389cb6c9a
Change-Id: Ie93d9df3fad63ba937b3069695744d5cadd2796c
Jerry Zhang [Thu, 17 Nov 2016 00:12:50 +0000 (00:12 +0000)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am:
935372bfd6
Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74
Jerry Zhang [Thu, 17 Nov 2016 00:11:15 +0000 (00:11 +0000)]
Clean up persistent usb state on boot.
am:
dfacad026d
Change-Id: I762306bc76e304c6491c8af18e82bf2e0c4b433e
Jerry Zhang [Thu, 17 Nov 2016 00:10:25 +0000 (00:10 +0000)]
Fixed handling of usb state during adb changes.
am:
0269ebe0fe
Change-Id: I2fc3674c4d5cc63febe2ebf47576f3cf1bcd1da2
Ningyuan Wang [Thu, 17 Nov 2016 00:01:23 +0000 (00:01 +0000)]
Merge "Add security capabilities enums to ScanResult" am:
a3c0324824
am:
6e67bb87cf
Change-Id: I02934a0a018bf759559d710f2edff1abe49df2cd
Jerry Zhang [Wed, 16 Nov 2016 23:59:32 +0000 (23:59 +0000)]
Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
* changes:
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
Clean up persistent usb state on boot.
Fixed handling of usb state during adb changes.
Ningyuan Wang [Wed, 16 Nov 2016 23:54:24 +0000 (23:54 +0000)]
Merge "Add security capabilities enums to ScanResult"
am:
a3c0324824
Change-Id: Iad2aba87155d52343b372b2d7af3e037842c1ca4