drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
218,294 Commits 1 Branch 0 Tags
Commit Graph

218294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zach Jang
0cae838166 am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'b5173241d160a5b6f4d440a01c9a9b0281ee4e66':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 21:06:58 +00:00
Jeff Sharkey
9314f94b68 am b7b17fa6: am 281a868c: am e1a6299b: Relax locking when scanning private volumes. 
* commit 'b7b17fa6a14a6916f12568f02360a1ec1792f256':
  Relax locking when scanning private volumes.
 2015-09-21 20:48:56 +00:00
Chong Zhang
23d62fd37d Do not do setSurface on window size changes 
Surface should only be invalidated when surface generation changed
(which we're already doing). Window size change doesn't always imply
a surface change. During a drag-resizing action, the window size is
constantly changing but the surface remains the same. setSurface
could take 12ms+ each frame and cause frame drops.

bug: 23793966

Change-Id: Iac0456122e8916cf06b1a7a0940584ab4bf4065d
 2015-09-21 13:46:53 -07:00
Chris Craik
e3b60e26fd Merge "Unify extensions parsing behavior" 2015-09-21 20:43:23 +00:00
Jeff Sharkey
b7b17fa6a1 am 281a868c: am e1a6299b: Relax locking when scanning private volumes. 
* commit '281a868c69e0915efc16eb3c65f669bbf0df69df':
  Relax locking when scanning private volumes.
 2015-09-21 20:40:08 +00:00
Jeff Sharkey
281a868c69 am e1a6299b: Relax locking when scanning private volumes. 
* commit 'e1a6299b994bbdb304550e00d5b3b26a064bdf0c':
  Relax locking when scanning private volumes.
 2015-09-21 20:29:58 +00:00
Todd Kennedy
6b79ad655e Merge "save "retain loader" state" 2015-09-21 20:18:58 +00:00
Chris Craik
6e6646c037 Unify extensions parsing behavior 
Removes remnants of EGL extension support, and persistence of
GL extension list.

Change-Id: I35aec12d900bdb33549ea47654bb8146f350ef48
 2015-09-21 13:14:20 -07:00
Zach Jang
ba80596bc0 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 'f8cda08986a5caa14daace69e24c82224ac5a9fc':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 19:10:51 +00:00
Zach Jang
b5173241d1 am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'e54c195a53694696e0913722fa721c882e33753e':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 19:10:46 +00:00
Zach Jang
f8cda08986 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 'b2b3cecbd3de80d40f8c207c6aa94532c3426829':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 18:58:27 +00:00
Zach Jang
e54c195a53 am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-21 18:58:18 +00:00
Robert Carr
64b5e1c4f9 Enforce a timeout for Content Providers to be published. 
ActivityManagerService: In the case where we are launching
an application on behalf of a Content Provider request,
enforce a timeout inbetween the application attaching and
the content providers being published. Consider that a defective
content provider may block in ContentProvider::onCreate
indefinitely: in such a case the PROC_START_TIMEOUT has already
been removed as the activity manager must have called bindApplication.

In these cases, there will be nothing to wake threads blocking
on the (non timed) wait for provider to be published at the end of
ActivityManagerService::getContentProviderImpl. This can cause binder
threads to block 1 by 1 until eventually AMS runs out and becomes
unresponsive.

Bug: 22141958
Change-Id: I2226da5df5c79b37f0b896423b3c1eaa4a7ecbba
(cherry picked from commit da33c13434cb20a11b522374411a5b819503e4e0)
 2015-09-21 18:03:50 +00:00
Todd Kennedy
f8f2e334ac Merge "Save Fragment's hidden state" 2015-09-21 18:01:26 +00:00
Toni Barzic
a3a9194e46 Read autoclick delay from settings 
Instead of hardcoding autoclick delay, use
Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY value.
Adds logic for observing the setting's changes and updating the delay
that should be used when scheduling automatical click.

BUG=23113412

Change-Id: Iffe3df0cb64ab28f13d2803d01d581280aedf422
 2015-09-21 10:52:23 -07:00
Soonil Nagarkar
d642698a81 Fix reintroduction of b/10845061 
Prevent crash in case where NLP is not available. Also fix an integer
overflow bug that remained uncaught.

BUG: 22345134
Change-Id: If6ff7b12f0d15bb2fe97589f8b0be10f9ed06197
(cherry picked from commit 2ec5c5cced4bd5b9dfbb7578f573c56b3bbc7ddf)
 2015-09-21 17:40:32 +00:00
Rob Carr
1386b299f7 Merge "Enforce a timeout for Content Providers to be published." 2015-09-21 17:33:39 +00:00
Matthew Dempsky
9b9da70418 Merge "Eliminate uses of Skia's SkDELETE macro" 2015-09-21 16:30:32 +00:00
Gus Prevas
83db929f08 Resolved conflicts for 31bd01a1 to master. 
Change-Id: I469d2e884831c38731b1de2604179fcdcea67ddb
 2015-09-21 10:41:19 -04:00