Phil Burk
95129f50c6
BluetoothMidiDevice: change write type to support JamStik
...
Temporarily use a Request instead of a Command so that the JamStik
will be properly enabled.
Bug: 24207964
Change-Id: I3d11732958c46e6039405b5969d5af0db8032fb9
Signed-off-by: Phil Burk <philburk@google.com>
2015-09-22 12:30:52 -07:00
Alan Viverette
50c29cd92f
Allow color state list for vector drawable fill and stroke
...
Removes unnecessary invalidateSelf() from VD.onStateChange(). This is
handled by the view hosting the drawable.
Bug: 22984152
Change-Id: Idf11a0ffef392cb1d8452aa3f5f836b35027a756
2015-09-22 15:03:50 -04:00
Adam Lesinski
112c1dc63a
am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
...
* commit '6a8d1fd62f73a241e7962b3baa3720a6dcd0767b':
Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:58:50 +00:00
Chris Craik
11718bc17b
Remove shader based gamma approach
...
Also fixes some INIT_LOGD logs
Change-Id: I212a71a1e7b366aea41f7c3c8cc169d509d6e4a2
2015-09-22 11:58:32 -07:00
Andreas Gampe
5d7b68d491
am 53ed452e: am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
...
* commit '53ed452e86aa186b5903b65057b4473629292f0d':
Frameworks/base: Propagate boot status to installd
2015-09-22 18:54:19 +00:00
Adam Lesinski
6a8d1fd62f
am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
...
* commit 'dbca76cda1a2a6fa95c592654f8649cb30b65833':
Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:50:56 +00:00
Andreas Gampe
53ed452e86
am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
...
* commit '9ce68b24440a7bc326cad2d09940ccf750eb2b2a':
Frameworks/base: Propagate boot status to installd
2015-09-22 18:44:47 +00:00
Adam Lesinski
dbca76cda1
am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
...
* commit '1b57758a1bb814c3a00ec864fe164bfe7861a9ab':
Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:42:33 +00:00
Andreas Gampe
9ce68b2444
am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
...
* commit 'b49245f96233b7f89fb5d4ba52576131ca6fb47a':
Frameworks/base: Propagate boot status to installd
2015-09-22 18:36:43 +00:00
Adam Lesinski
1b57758a1b
Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
2015-09-22 18:33:14 +00:00
Andreas Gampe
b49245f962
Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
2015-09-22 18:27:39 +00:00
Todd Kennedy
e16fb554dd
save "retain loader" state
...
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.
Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
2015-09-22 10:16:42 -07:00
Diego Perez
361523281c
am 0e766de7: Avoid calling scrollBy(0,0) on render
...
* commit '0e766de7c52d7e375e04676c93a872cb2d6eea63':
Avoid calling scrollBy(0,0) on render
2015-09-22 16:56:35 +00:00
Diego Perez
0e766de7c5
Avoid calling scrollBy(0,0) on render
...
Usually scrollBy(0, 0) won't have any effect but when called on the
NumberPicker but, in some cases, it seems to cause an endless loop.
When called from layoutlib, this will hold the read lock causing all
operations trying to acquire the write lock to block forever.
Bug: http://b.android.com/182506
Change-Id: Ib25427d3f32d804d1c481d979795eee71fbdbc6d
2015-09-22 16:44:37 +00:00
Elliott Hughes
776fa57b2d
am aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
...
* commit 'aa31169804dffa3b36654ccffe67a53f6ff4cdaf':
WrapperInit: remove dead execStandalone method
2015-09-22 15:50:09 +00:00
Elliott Hughes
aa31169804
am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
...
* commit '0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
WrapperInit: remove dead execStandalone method
2015-09-22 15:42:36 +00:00
Elliott Hughes
0361b18ea1
Merge "WrapperInit: remove dead execStandalone method"
2015-09-22 15:34:26 +00:00
Alan Viverette
31cb4bb41f
Merge "SubMenuBuilder.getRootMenu() should return root menu, not parent"
2015-09-22 13:48:04 +00:00
Selim Cinek
bb998c927c
Extended the maximum pulsing duration when dozing
...
Change-Id: Ib0f4cb4c7a011ce6df4100189b79ed4c2476c2c6
2015-09-22 10:05:29 +02:00
Todd Kennedy
d65fc9c460
am d8b47855: save "retain loader" state DO NOT MERGE
...
* commit 'd8b47855a316700751f7daead0b180005853be33':
save "retain loader" state DO NOT MERGE
2015-09-22 07:27:18 +00:00
Todd Kennedy
d8b47855a3
save "retain loader" state DO NOT MERGE
...
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.
Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
(cherry picked from commit c5ac16f531504d5bde7c87f8e3088652daeb543f)
2015-09-22 07:19:14 +00:00
Chong Zhang
87b21722c2
Change resizeTask's parameter resizedByUser to constants
...
to indicate who initiated the resize, or if the resize should be forced.
Change-Id: Ic7021f76bec677027cbf27deeb63f92ea911a75c
2015-09-22 00:46:02 +00:00
Adam Lesinski
52290c9c4f
Fix Array Index Out of Bounds in BatteryStatsImpl
...
If the power profile was not set yet, the default sizes of
cpu freq arrays could have been too small.
Bug:24244089
Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00
2015-09-21 17:38:52 -07:00
Filip Gruszczynski
9e6b091213
Merge "Split PhoneWindowManager.beginLayoutLw."
2015-09-21 23:52:04 +00:00
Chris Craik
3b8e25afd1
Merge "Remove legacy enable/disable methods from Blend"
2015-09-21 23:21:04 +00:00
Chris Craik
571b9da84f
Merge "Remove unnecessary glop color storage"
2015-09-21 23:19:42 +00:00
Chris Craik
6c2c62c1ed
Remove unnecessary glop color storage
...
Change-Id: I68817449d2e0d593dccb7e9be8c8ca45b7ab2fc2
2015-09-21 16:16:22 -07:00
Chris Craik
8e5ca2a990
Remove legacy enable/disable methods from Blend
...
Change-Id: I147f96d1fbdd34b9d056620e7259a9f96b13fea7
2015-09-21 16:00:14 -07:00
Chong Zhang
cf5c5f2c4e
Merge "Misc fixes for window moving and resizing"
2015-09-21 22:59:02 +00:00
Chong Zhang
3005e75585
Misc fixes for window moving and resizing
...
- Do not skip resizeTask if we're starting or ending drag. We need
the relayout because surface mode is changing.
- When we're changing the surface mode, need to wait for the first
draw to finish before we can modify shown frame. Otherwise there
could be 1 old frame displayed with new position, which makes the
window position look a bit off.
- Clean up dragResizing/dragResizeChanged flags.
Change-Id: Ia396d6b88fd616ad57aa8cd24ca7e1161add7205
2015-09-21 15:52:11 -07:00
Andreas Gampe
06bb908b78
Frameworks/base: Propagate boot status to installd
...
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.
Bug: 23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
2015-09-21 15:16:13 -07:00
Daniel Micay
13eac10a26
WrapperInit: remove dead execStandalone method
...
This became dead with the removal of support for the non-runtime-init
code path in f48029f00a66e23d7872a00b56fbcf88528ba476.
Change-Id: Id68e0da4658e83f0d3bfd8645152165faacac5fa
2015-09-21 18:14:56 -04:00
Toni Barzic
f71476eabd
Merge "Read autoclick delay from settings"
2015-09-21 22:13:26 +00:00
Zach Jang
cb42de5936
am 01ce0783: (-s ours) am 5695a7f6: am ef44f99d: am 88f92ec5: am fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Setting
...
* commit '01ce078379715047b767c11a8181599c85a58c74':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 22:09:47 +00:00
Zach Jang
c087ee3ec0
am 5d05906d: (-s ours) am 3a273f45: am 4a9ccd15: am c53f18b7: am 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '5d05906d56ef9f118a7b6f6979ed4b7b9c31a575':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 22:09:39 +00:00
Chong Zhang
6e533d5379
Merge "Do not do setSurface on window size changes"
2015-09-21 22:09:10 +00:00
Stefan Kuhne
fe1f99c2b2
Merge "MultiThreaded rendering of different renderNodes"
2015-09-21 22:08:30 +00:00
Zach Jang
01ce078379
am 5695a7f6: am ef44f99d: am 88f92ec5: am fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '5695a7f6402aef65f5f4a90a2a833446168ea999':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 22:02:36 +00:00
Zach Jang
5d05906d56
am 3a273f45: am 4a9ccd15: am c53f18b7: am 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '3a273f457cd045dcd8ea30f75d0704607499d60f':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 22:02:29 +00:00
Zach Jang
5695a7f640
am ef44f99d: am 88f92ec5: am fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit 'ef44f99d90e81de4dff92d7cdbdb58e6b38fcbd4':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 21:52:55 +00:00
Zach Jang
3a273f457c
am 4a9ccd15: am c53f18b7: am 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '4a9ccd15bd42cfb600d180ae6b7a5ddbebaffc59':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 21:52:49 +00:00
Jeff Sharkey
fd83681aea
am e1964182: am 9314f94b: am b7b17fa6: am 281a868c: am e1a6299b: Relax locking when scanning private volumes.
...
* commit 'e1964182de52d00950219810798ea4e7900fb57b':
Relax locking when scanning private volumes.
2015-09-21 21:47:35 +00:00
Zach Jang
ef44f99d90
am 88f92ec5: am fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '88f92ec5a76c94dcb084ffcc8a4fc36a66bb9ca2':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 21:45:09 +00:00
Zach Jang
4a9ccd15bd
am c53f18b7: am 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit 'c53f18b7b3cea030983e23fbf0d49dfcda77b249':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 21:45:05 +00:00
Jeff Sharkey
e1964182de
am 9314f94b: am b7b17fa6: am 281a868c: am e1a6299b: Relax locking when scanning private volumes.
...
* commit '9314f94b687deb21acd7f05810d3edf1a4e8fcbc':
Relax locking when scanning private volumes.
2015-09-21 21:39:01 +00:00
Zach Jang
88f92ec5a7
am fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit 'fed2854653d7e9d596cf1d9cb9c41ff05e744e94':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 21:37:34 +00:00
Zach Jang
c53f18b7b3
am 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '937141cb75160a1a51b9568481225aec286c5a86':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 21:37:30 +00:00
Zach Jang
fed2854653
am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 21:30:32 +00:00
Zach Jang
937141cb75
am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '0cae8381666248e44875756e72998e55ed3f9151':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 21:30:27 +00:00
Zach Jang
3e344f3fcb
am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit 'ba80596bc0d51b3ddf14c1612c341992bc3ac5fc':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 21:07:04 +00:00