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

3770 Commits

Author SHA1 Message Date
Dianne Hackborn
51bd204112 am bfa6190f: am 144508d5: Merge "Revert white space changes." into lmp-dev 
* commit 'bfa6190fcc5ac607bf7045963d57b06cc2b16207':
  Revert white space changes.
 2014-10-01 23:31:49 +00:00
Dianne Hackborn
bfa6190fcc am 144508d5: Merge "Revert white space changes." into lmp-dev 
* commit '144508d5da4dec37183617ec259ab83d2db4f012':
  Revert white space changes.
 2014-10-01 23:25:43 +00:00
Dianne Hackborn
144508d5da Merge "Revert white space changes." into lmp-dev 2014-10-01 23:21:11 +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
Dianne Hackborn
01945f240a Revert white space changes. 
Change-Id: I3bc9995adf5cefd91f5a9fd4d2a701056dba3ca9
 2014-10-01 15:14:28 -07: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
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
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
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
Matthew Williams
d55d3c597a am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit 'bc156ba430d286aaab8deb7bbb3bccc655cd2e92':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 00:52:38 +00:00
Lorenzo Colitti
6c1d0e0784 am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit 'd8f7e048281559462f9c590f9d7d48fb7fe065ce':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 00:52:34 +00:00
Jean-Michel Trivi
0ed179d185 am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '4a154af9aad13c09821ada6187440feaec2d38e8':
  Send volume keys to the default stream if not actually playing
 2014-10-01 00:51:32 +00:00
Brian Carlstrom
a39871ef5e Use VMRuntime.isBootClassPathOnDisk 
Bug: 17679443
Change-Id: If53c236058a7237d735c2344a715cf0a36301f9b
 2014-09-30 16:49:32 -07:00
Winson Chung
86ef70eb08 Fixing build (Bug 17381033) 
Change-Id: I95a7c8167f82a4fe982bdc9588d5fbaf5a627d0b
 2014-09-30 16:17:12 -07:00
Winson Chung
c12f574574 Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev 2014-09-30 22:48:43 +00:00
Craig Mautner
4fb4163f4c Merge "Call Surface.release() for starting windows" into lmp-dev 2014-09-30 22:47:05 +00:00
Wink Saville
fdadab4b5a Merge "Fix concurrent access violation." into lmp-mr1-dev 2014-09-30 22:30:05 +00:00
Etan Cohen
a33cf075fa Fix concurrent access violation. 
Change-Id: I8586629cafe585135f0f72ba011b65f81242fc22
 2014-09-30 22:23:49 +00:00
Winson Chung
c11b19caef Fixing an issue with leaking starting windows. (Bug 17657878) 
In some cases, when starting an animation while another starting window is visible,
the starting window is never scheduled to be removed.  In that case, we try and
schedule the closing app starting window to be removed when we are starting the
transition to a new activity.  This also partially addresses issues related to
leaking windows in b/17381033.

Change-Id: Id26525cd71380852f109ec2f55a4a60db5086ded
 2014-09-30 22:21:26 +00:00
Craig Mautner
49a2edf92a Call Surface.release() for starting windows 
If the window maanger received BinderDied for a starting window
before activity manager then it would null
AppWindowToken.startingWindow and not go through the
PhoneWindowManager.removeStartingWindow call later. That meant that
Surface.release() was never called from
ViewRootImpl.dispatchDetachedFromWindow(). Which in turn meant that
graphics memory was being leaked.

This change notifies the PhoneWindowManager to go through the
removeStartingWindow path when the starting window gets removed for
any reason.

This change also ensures that scheduleRemoveStartingWindow is
always called with the window manager lock held.

Fixes bug 17381033.

Change-Id: Ic6860d0e1410c9bb5053d85ae21a08b11f573b6d
 2014-09-30 15:05:37 -07:00