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

4372 Commits

Author SHA1 Message Date
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
Winson Chung
594d2a5690 am 7f54b3a9: am 6b59887e: am f7d4eb52: am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit '7f54b3a91430a73241b9ba34bfadf74997c495db':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-02 12:41:53 +00:00
Craig Mautner
bee6dfe09d am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '8a33674bed6791c63eee9d798693e25bc07b7cba':
  Don't clear visible-behind activity if it is top
 2014-10-02 00:58:50 +00:00
John Spurlock
b3a90ee245 am 7e67011f: am 394f29e7: am cd98a559: am c909e1b2: Zen: Fix new event category check. 
* commit '7e67011f15dd3c7df3200358d950cf4e4429db2c':
  Zen: Fix new event category check.
 2014-10-02 00:58:36 +00:00
Winson Chung
6b59887e57 am f7d4eb52: am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit 'f7d4eb52aef5670270d5ba727431d0b2411cbc58':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-01 23:05:36 +00:00
Winson Chung
f7d4eb52ae am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit '7f76e505624fddbc4ba3350f3e381ccd275a5a75':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-01 22:59:26 +00:00
Winson Chung
7f76e50562 Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 2014-10-01 22:53:29 +00:00
Winson Chung
dcf21d1545 Fixing invalid check to get component enabled state. (Bug 17679693) 
Change-Id: I225d59bf766122d667d990d7e5b1971c6e8af2aa
 2014-10-01 15:04:16 -07:00
Brian Carlstrom
37fdb6e981 am b3ab7b95: am c9e46543: am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit 'b3ab7b95a687e4de13d06822fb295ee726b4b42f':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 22:02:36 +00:00
Jeff Brown
7ee1f53d3d am 5a3f98aa: am f0245cb2: am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '5a3f98aa8aafc16f6a8c3a4e5a813f7459a7cd92':
  Reduce latency from doze to screen on.
 2014-10-01 22:02:24 +00:00
Wink Saville
ed49288a00 Merge commit '62321ab1' into fix-merge-conflict 
* commit '62321ab1':
  Maybe fix issue #17700474: manta: high occurrence of device booted...

Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java

Change-Id: Ica4d544d11c1f81be793bdb4dea610396b32e946
 2014-10-01 14:14:10 -07:00
Craig Mautner
3867e4d0c0 am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '9ab8fbbc60588b204d362bdab45d892e8274382b':
  Don't clear visible-behind activity if it is top
 2014-10-01 17:58:34 +00:00
Craig Mautner
9ab8fbbc60 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
 2014-10-01 17:52:57 +00:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +00:00
John Spurlock
394f29e761 am cd98a559: am c909e1b2: Zen: Fix new event category check. 
* commit 'cd98a55956a251aad1cafb8c55d2e683037b8b97':
  Zen: Fix new event category check.
 2014-10-01 17:20:30 +00:00
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top 
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
 2014-10-01 10:14:53 -07:00
Winson Chung
bb6a08cfdb am a173d9c8: am 57583c33: am d164460e: am 86ef70eb: Fixing build (Bug 17381033) 
* commit 'a173d9c83f411c74c2dfe8214a0f32cf6b66b7e7':
  Fixing build (Bug 17381033)
 2014-10-01 17:10:40 +00:00
Winson Chung
2a988941fc am cbb42d06: am 806a25a5: am 53c7483d: am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev 
* commit 'cbb42d06c21a4875bfb5d0c5ff73ceae062356d0':
  Fixing an issue with leaking starting windows. (Bug 17657878)
 2014-10-01 17:10:34 +00:00
Craig Mautner
f82897a21c am d2e3bfce: am c139a41c: am d6770a0c: am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev 
* commit 'd2e3bfcefddeef45b3bda04fd0e9ea00f62ab689':
  Call Surface.release() for starting windows
 2014-10-01 17:10:29 +00:00
Jeff Sharkey
ae66513bb0 am 029a4b98: am 3de5ed51: am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev 
* commit '029a4b98cc09a516f1ae37f580cb68047d01f2a2':
  Clear ident when obtaining provider across users.
 2014-10-01 17:10:08 +00:00
Svetoslav
047ab3b2e5 am cf0a3373: am 344ffbc6: am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit 'cf0a337352a228302d44f9582673c7acdba329ca':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 17:10:00 +00:00
John Spurlock
cd98a55956 am c909e1b2: Zen: Fix new event category check. 
* commit 'c909e1b2dfa2e47b786d96818f70f6308c5a78be':
  Zen: Fix new event category check.
 2014-10-01 16:56:02 +00:00
John Spurlock
c909e1b2df Zen: Fix new event category check. 
Allow events through if configured, and use a switch
for separating mode-specific logic.

Bug:17580878
Change-Id: Id7b5d8b50173015d6a78568ed0a90e0bccf98549
 2014-10-01 11:17:43 -04:00
Brian Carlstrom
c9e46543e7 am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit 'ae214fac0fa3887c41b1b16a0016a4e6f5b127b1':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 15:16:27 +00:00
Jeff Brown
f0245cb2e3 am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '6907304024f1c31d2d2dcf783588a6dd8865ecd8':
  Reduce latency from doze to screen on.
 2014-10-01 15:16:19 +00:00
Dianne Hackborn
d0ab6d6dbf am 88998f79: am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 
* commit '88998f79f1344650bc3ebf704600b03bfde2619f':
  Maybe fix issue #17700474: manta: high occurrence of device booted...
 2014-10-01 15:16:09 +00:00
Winson Chung
57583c33ec am d164460e: am 86ef70eb: Fixing build (Bug 17381033) 
* commit 'd164460e692762226560af77b6b360ae83335b8f':
  Fixing build (Bug 17381033)
 2014-10-01 15:15:36 +00:00
Winson Chung
806a25a515 am 53c7483d: am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev 
* commit '53c7483dd9545ddd395af2486f94eb93fea0a81a':
  Fixing an issue with leaking starting windows. (Bug 17657878)
 2014-10-01 15:15:32 +00:00
Craig Mautner
c139a41ce7 am d6770a0c: am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev 
* commit 'd6770a0cab31dec87c12d5d8cfaaad96d65ed828':
  Call Surface.release() for starting windows
 2014-10-01 15:15:28 +00:00
Jeff Sharkey
3de5ed51d6 am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev 
* commit '7bd4aba1a81538897fc173a824b6e8eec568f945':
  Clear ident when obtaining provider across users.
 2014-10-01 15:15:10 +00:00
Svetoslav
344ffbc647 am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '567c97881b1d1719d32daaf647979e47e01be438':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:15:03 +00:00
Brian Carlstrom
ae214fac0f am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit '7123bd690fa14d0b9e33f5a70c58ea5b5f1b7d32':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 15:03:39 +00:00
Jeff Brown
6907304024 am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '62434d6a4b4b5aa7d44aa4344b5cb0f82df2b923':
  Reduce latency from doze to screen on.
 2014-10-01 15:03:24 +00:00
Dianne Hackborn
88998f79f1 am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 
* commit '62321ab11460fd852449b3f6a2113694e3e04e7a':
  Maybe fix issue #17700474: manta: high occurrence of device booted...
 2014-10-01 15:03:02 +00:00
Winson Chung
d164460e69 am 86ef70eb: Fixing build (Bug 17381033) 
* commit '86ef70eb08b83fc41d0c8e124315d9ee9fea0ee4':
  Fixing build (Bug 17381033)
 2014-10-01 15:02:18 +00:00
Winson Chung
53c7483dd9 am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev 
* commit 'c12f57457411e67adf2c8acaad21b08c934e583b':
  Fixing an issue with leaking starting windows. (Bug 17657878)
 2014-10-01 15:02:01 +00:00
Craig Mautner
d6770a0cab am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev 
* commit '4fb4163f4c6f49eebc34d1b193c526558af0d375':
  Call Surface.release() for starting windows
 2014-10-01 15:01:57 +00:00
Jeff Sharkey
7bd4aba1a8 am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev 
* commit 'b27d43a8805769f9a9dfdc024b5cd19b71cfd8d7':
  Clear ident when obtaining provider across users.
 2014-10-01 15:01:05 +00:00
Svetoslav
567c97881b am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '44d4eeaa48721296663a05d01071f196a509dc34':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:00:44 +00:00
Brian Carlstrom
7123bd690f Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 2014-10-01 04:21:26 +00:00
Jeff Brown
62434d6a4b Merge "Reduce latency from doze to screen on." into lmp-dev 2014-10-01 02:31:30 +00:00
Matthew Williams
c926b2f175 am 99771e9e: am 9a957e09: am d55d3c59: am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit '99771e9ea7e68eb8a7578361d5ee24a037dc382d':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 01:43:15 +00:00
Lorenzo Colitti
505315d6c6 am 2f82b128: am 5e7f08f5: am 6c1d0e07: am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit '2f82b128afd3b5540097ee88ec3df86a31938f3c':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 01:43:11 +00:00
Jean-Michel Trivi
40a47f6dd7 am 4b495477: am 9f1bca5f: am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '4b495477d957cef0b0e199674d63b6147a3c4e58':
  Send volume keys to the default stream if not actually playing
 2014-10-01 01:42:42 +00:00
Dianne Hackborn
62321ab114 Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 2014-10-01 01:16:15 +00:00
Dianne Hackborn
7622a0f8e4 Maybe fix issue #17700474: manta: high occurrence of device booted... 
...but dev.bootcomplete flag is not set

Rework things to address a few issues I found:

- When the activity goes idle, the way we were handling finishing the
  boot there was calling finishBooting() with the lock held, but it
  shouldn't.  We now dispatch that and turning on the screen together
  in a separate message.

- Make sure we don't try to start the home activity until we have
  reached the point of the system being ready and mBooting being set.
  This ensures we don't do any work prematurely.

Change-Id: If30c1f287af73bc2164e7aadbe98022ae42cc5e7
 2014-09-30 18:05:18 -07:00
Jeff Brown
0a434776b8 Reduce latency from doze to screen on. 
Don't wait for the brightness ramp to complete before reporting
display ready.  Keep track of whether we have any unfinished
brightness changes and take care to grab a wakelock to ensure
they are eventually applied.

Ideally we would rewrite the whole state machine to more carefully
coordinate screen state and brightness changes but that's too
risky for now.

The pixel fairies are having a bad day.

Bug: 17718416

(cherry picked from commit 875f80c2732a3fbe652a6e8fc14031041f791308)

Change-Id: I7a2d8ba4591a12b773653d3dbf86c7db016f967e
 2014-09-30 18:00:40 -07:00
Matthew Williams
9a957e0904 am d55d3c59: am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit 'd55d3c597a889ec1ac5b0fc1248a605fc49f5d38':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 00:59:20 +00:00
Lorenzo Colitti
5e7f08f513 am 6c1d0e07: am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit '6c1d0e07840d124921fd30f04ad11b409ea73b3e':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 00:59:16 +00:00
Jean-Michel Trivi
9f1bca5f21 am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '0ed179d185bc976779c6959b4d2d11c19538e60b':
  Send volume keys to the default stream if not actually playing
 2014-10-01 00:58:55 +00:00