John Reck
91d1bbce59
Merge "Avoid starving RT anims" am: f77c220aa9
...
am: 7269372d5f
2016-11-18 00:28:54 +00:00
John Reck
7269372d5f
Merge "Avoid starving RT anims"
...
am: f77c220aa9
2016-11-18 00:14:05 +00:00
Treehugger Robot
f77c220aa9
Merge "Avoid starving RT anims"
2016-11-17 23:53:00 +00:00
John Reck
a5b7b89166
Avoid starving RT anims
...
Test: Manual, usleep(16000) in DrawFrameTask and tap
on recents
Merged-In: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
Change-Id: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
2016-11-17 22:05:22 +00:00
Brad Ebinger
3ae84b6efe
Merge "Readability improvements in Logging" am: d51df736f6
...
am: 90b6e78657
2016-11-17 19:35:08 +00:00
Brad Ebinger
90b6e78657
Merge "Readability improvements in Logging"
...
am: d51df736f6
2016-11-17 19:29:17 +00:00
Brad Ebinger
d51df736f6
Merge "Readability improvements in Logging"
2016-11-17 19:18:00 +00:00
Dimitry Ivanov
b8e43f60c2
Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1
...
am: 6a5e1a7f4a
2016-11-17 18:57:58 +00:00
Dimitry Ivanov
6a5e1a7f4a
Merge "Fix coretests: Remove dependency on libnativehelper"
...
am: f68cb55cc1
2016-11-17 18:50:29 +00:00
Treehugger Robot
f68cb55cc1
Merge "Fix coretests: Remove dependency on libnativehelper"
2016-11-17 18:37:42 +00:00
Przemyslaw Szczepaniak
728ce76156
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am: caa816451c
...
am: d771b36951
2016-11-17 15:49:22 +00:00
Przemyslaw Szczepaniak
d771b36951
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
...
am: caa816451c
2016-11-17 15:41:57 +00:00
Przemyslaw Szczepaniak
caa816451c
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
2016-11-17 15:28:53 +00:00
Pavlin Radoslavov
ffb6a4beab
Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b
...
am: c15cc348e8
2016-11-17 07:16:13 +00:00
Pavlin Radoslavov
c15cc348e8
Merge "Don't disconnect an A2DP device when connecting to same device"
...
am: 3ebcf1218b
2016-11-17 07:07:20 +00:00
Treehugger Robot
3ebcf1218b
Merge "Don't disconnect an A2DP device when connecting to same device"
2016-11-17 06:58:43 +00:00
Pavlin Radoslavov
eb067ba741
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
2016-11-17 05:29:08 +00:00
Dimitry Ivanov
43b1b3ff0b
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
2016-11-16 18:35:35 -08:00
Peter Qiu
120cb677f0
Merge "wifi: add constant definition for EAP types" am: a908e65b66
...
am: 40dfd2d0bc
2016-11-17 02:28:13 +00:00
Peter Qiu
40dfd2d0bc
Merge "wifi: add constant definition for EAP types"
...
am: a908e65b66
2016-11-17 02:21:41 +00:00
Treehugger Robot
a908e65b66
Merge "wifi: add constant definition for EAP types"
2016-11-17 02:10:23 +00:00
Jerry Zhang
12488ed15f
Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204
...
am: 1faf15d422
2016-11-17 00:36:52 +00:00
Jerry Zhang
fb4a03c8f8
Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6
...
am: 5cbd151d40
2016-11-17 00:24:41 +00:00
Jerry Zhang
5d77efb3d9
Clean up persistent usb state on boot. am: dfacad026d
...
am: b15490ac4d
2016-11-17 00:23:47 +00:00
Jerry Zhang
1faf15d422
Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
...
am: b37d826204
2016-11-17 00:22:59 +00:00
Jerry Zhang
dbcbadbb99
Fixed handling of usb state during adb changes. am: 0269ebe0fe
...
am: 4389cb6c9a
2016-11-17 00:22:53 +00:00
Jerry Zhang
5cbd151d40
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
...
am: 935372bfd6
2016-11-17 00:12:50 +00:00
Jerry Zhang
b15490ac4d
Clean up persistent usb state on boot.
...
am: dfacad026d
2016-11-17 00:11:15 +00:00
Jerry Zhang
4389cb6c9a
Fixed handling of usb state during adb changes.
...
am: 0269ebe0fe
2016-11-17 00:10:25 +00:00
Ningyuan Wang
7cad272109
Merge "Add security capabilities enums to ScanResult" am: a3c0324824
...
am: 6e67bb87cf
2016-11-17 00:01:23 +00:00
Jerry Zhang
b37d826204
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.
2016-11-16 23:59:33 +00:00
Ningyuan Wang
6e67bb87cf
Merge "Add security capabilities enums to ScanResult"
...
am: a3c0324824
2016-11-16 23:54:24 +00:00
Treehugger Robot
a3c0324824
Merge "Add security capabilities enums to ScanResult"
2016-11-16 23:42:25 +00:00
Peter Qiu
4a79ac2c82
wifi: add constant definition for EAP types
...
Bug: 32810711
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ia62f2674e8cdf975d1380f733a8687bdb15ed197
2016-11-16 13:49:22 -08:00
Yifan Hong
afe46992b8
Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d
...
am: 2f7a3f9595
2016-11-16 19:16:45 +00:00
Ningyuan Wang
d150b2b001
Add security capabilities enums to ScanResult
...
This adds enums of security parameters, including
protocol, key management, and cipher suites.
Bug: 32512793
Test: compile
Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17
2016-11-16 11:13:42 -08:00
Yifan Hong
2f7a3f9595
Merge "Fix include after spliting HidlSupport.h"
...
am: efd7b9f57d
2016-11-16 19:10:20 +00:00
Brad Ebinger
0c3541be65
Readability improvements in Logging
...
We now truncate Session method paths and IDs based on the Logging level
to improve Session Logging readability in logcat. If another external
session is started off of an existing external Session, the preceding
histories are replaced with "..." so that the Session information is not
overwhelming.
Bug: 26571395
Test: Unit Tests and manual tests pass
Change-Id: I9ffda3d64f1072fa6228a82a86116a5e47d18c96
2016-11-16 11:05:15 -08:00
Yifan Hong
efd7b9f57d
Merge "Fix include after spliting HidlSupport.h"
2016-11-16 19:01:00 +00:00
Andreas Gampe
6a454c86db
Merge "Preload2: Fix dependencies" am: 3b379ee94e
...
am: 74b4e070be
2016-11-16 18:32:56 +00:00
Andreas Gampe
74b4e070be
Merge "Preload2: Fix dependencies"
...
am: 3b379ee94e
2016-11-16 18:25:37 +00:00
Treehugger Robot
3b379ee94e
Merge "Preload2: Fix dependencies"
2016-11-16 18:15:06 +00:00
Martijn Coenen
6e2c276c78
Merge "Fix deprecated range_x calls." am: 87cafe8f33
...
am: d03b17c29a
2016-11-16 10:07:54 +00:00
Martijn Coenen
d03b17c29a
Merge "Fix deprecated range_x calls."
...
am: 87cafe8f33
2016-11-16 10:00:23 +00:00
Martijn Coenen
87cafe8f33
Merge "Fix deprecated range_x calls."
2016-11-16 09:48:31 +00:00
Hidenari Koshimae
9f0cc266ce
Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa
...
am: 9997fcc72c
2016-11-16 08:18:30 +00:00
Hidenari Koshimae
9997fcc72c
Merge "CountDownTimer: not skip onTick()"
...
am: 224d9e48fa
2016-11-16 08:10:54 +00:00
Treehugger Robot
224d9e48fa
Merge "CountDownTimer: not skip onTick()"
2016-11-16 07:55:27 +00:00
longhai
5c152a3d7f
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159
...
am: 2be54fde72
2016-11-16 03:11:09 +00:00
longhai
2be54fde72
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."
...
am: 1813ae0159
2016-11-16 03:04:38 +00:00
