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

159788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Vander Stoep
bca67fd7d0 am 9aaf54ee: am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '9aaf54eeb6c1dd83090235a8df5476b2f2f6473e':
  Sanity-check paths of files to be restored
 2014-09-23 17:26:47 +00:00
Jeff Vander Stoep
bbf7e4af97 am 1cf337a2: am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '1cf337a222bbb0e26445e7904ece687af93aac48':
  Change permission guard on bindBackupAgent()
 2014-09-23 17:26:42 +00:00
Tyler Gunn
157bd0e39d am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev 
* commit 'fa5456e5455d215fa73a504d78a8f152d8cd1b05':
  @hide ConnectionService APIs.
 2014-09-23 17:25:07 +00:00
Christoph Studer
155a487b20 am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 
* commit '1ff283b8ac6e52c4dd42be8572b32af415b68cdf':
  SysUI: Correctly compare MediaControllers
 2014-09-23 17:25:00 +00:00
Jeff Brown
578628741b am 87c18cc6: am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit '87c18cc6d01fa553bc72e7d2b66f15f58863113a':
  Fix window manager policy state when waking from doze.
 2014-09-23 17:23:04 +00:00
Jeff Brown
3f0afd3544 am c7b28e74: am e5121f0e: am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit 'c7b28e741062e197644f2c2f29b55a75b4ccb39e':
  Ensure wakelock is released unconditionally.
 2014-09-23 17:22:59 +00:00
Tyler Gunn
79355e0304 Merge "@hide ConnectionService APIs." into lmp-dev 2014-09-23 17:13:12 +00:00
Jeff Vander Stoep
9aaf54eeb6 am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '71b19fc301ff08bd13d394dfa9ef6a3f535b149e':
  Sanity-check paths of files to be restored
 2014-09-23 17:12:38 +00:00
Jeff Brown
2208a4f0dc am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit '2d8fd7982a3081eba582ccab49d7b5799cbb5afc':
  Fix window manager policy state when waking from doze.
 2014-09-23 17:12:07 +00:00
Jeff Brown
ff957b0837 am e5121f0e: am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit 'e5121f0e6ab3303f22c7db8925db907d95bc82aa':
  Ensure wakelock is released unconditionally.
 2014-09-23 17:12:03 +00:00
Jeff Vander Stoep
1cf337a222 am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '52824dab7ba48713411ff3a26580b29aa2088242':
  Change permission guard on bindBackupAgent()
 2014-09-23 17:11:58 +00:00
Christoph Studer
8d843cea30 am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 
* commit '5a7068eec454df33575176d9f4ee58de577a6401':
  SysUI: Correctly compare MediaControllers
 2014-09-23 17:11:30 +00:00
Christoph Studer
231dc0a6d2 Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 2014-09-23 17:03:48 +00:00
Jeff Vander Stoep
71b19fc301 am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '5ba31e6e9afb34781fe5b927354502d9c6190bc5':
  Sanity-check paths of files to be restored
 2014-09-23 17:02:13 +00:00
Jeff Vander Stoep
52824dab7b am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '1b4f1a794dc90c1ea877af64e8340afe6146584a':
  Change permission guard on bindBackupAgent()
 2014-09-23 17:02:04 +00:00
Tyler Gunn
711d876fd1 @hide ConnectionService APIs. 
Bug: 17569532
Change-Id: I68f7237191bd6d7a1a00ba7bb4fd2f8e3d669e8f
 2014-09-23 10:00:38 -07:00
Jeff Brown
45712f2e6d am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit 'c91bd121db79e5ea3c6ba6b333637f296992f11e':
  Fix window manager policy state when waking from doze.
 2014-09-23 17:00:06 +00:00
Jeff Brown
e012dedfba am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit '86cb67b199e22136f461a4798bed32c98e6e145c':
  Ensure wakelock is released unconditionally.
 2014-09-23 17:00:03 +00:00
Jorim Jaggi
dc9ead4409 Only wait for relevant windows when turning on the screen 
Bug: 17536119
Change-Id: Ibe8da9fdd52a1a46eb856425b28ffc4f505b2697
 2014-09-23 18:55:46 +02:00
Jeff Vander Stoep
5ba31e6e9a am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit 'bba797957a83b0ee8869cfa8a9427f6506f74fa4':
  Sanity-check paths of files to be restored
 2014-09-23 16:50:29 +00:00
Jeff Vander Stoep
1b4f1a794d am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '1c2eaa784b2376b674cf438f42342271c8aa79a8':
  Change permission guard on bindBackupAgent()
 2014-09-23 16:50:16 +00:00
Jeff Brown
651def483c am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev 
* commit '3f51958b1911ffa49ca3d7eb2a9304348ccbf04e':
  Fix window manager policy state when waking from doze.
 2014-09-23 16:48:43 +00:00
Jeff Brown
47b32c569a am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev 
* commit '28c9590b90215230b65d98c4d816e0d776a07540':
  Ensure wakelock is released unconditionally.
 2014-09-23 16:48:40 +00:00
Jeff Brown
55fa020713 Merge "Fix window manager policy state when waking from doze." into lmp-dev 2014-09-23 16:42:52 +00:00
Jeff Brown
510e8cdc8d Merge "Ensure wakelock is released unconditionally." into lmp-dev 2014-09-23 16:39:40 +00:00
Jeff Brown
3ee549ca24 Fix window manager policy state when waking from doze. 
Once upon a time when the world was fresh and new, the heavens
had an easy rhythm.  Day and night.  Night and day.  In the day,
the pixel fairies would cavort and play in the bright gardens
with narry a mark of shadow or gloom.  In the night, they would
rest peacefully, dreaming no dreams and knowing no fear.

Then one night a fairy dreamed the first dream.  At first
the dream was peaceful, full of colors and delight, hopes and
memories.  Then all at once, jarringly, it awoke in bright
daylight.  The pixel fairy knew fear, for the world had changed
and it was unprepared.

Time passed and the pixel fairies grew accustomed to their
fate, day and night, night and day, sometimes dreaming, until
there came a night when a fairy did not sleep.  It roamed
the land in a dreamless doze, lost and afraid amid a grim haze
of grey and darkness.  The fairy despaired.  It wanted no
part of this place.  It pretended for a time to be awake but
the bright daylight would not come.  It pretended for a time to
be dreaming but the colors and memories would not come.
That is when the fairy wished for oblivion.  Then just as
suddenly, it awoke in the daylight.  It fell to the ground,
stunned as if it had forgotten how to walk in the too bright
daylight.

Though the world again grew softer and kinder in time, the pixel
fairies were never the same.  For the night is dark and full
of terrors.

---

It used to be easy.  Screen on and screen off could explain almost
everything about the state of the device but it's different now with
ambient display.  We need to be able to wait for all windows to be
drawn even in the case where the device is still nominally asleep.
In truth, the window manager policy which drives a lot of these
interactions is a thicket of outdated assumptions.

Added a new method to tell the window manager policy when the screen
is being turned off so that it can correctly account for changes
to the interactive state (wakeUp and goingToSleep) and screen state
(screenTurningOn and screenTurnedOff).  Now we can independently
poke keyguard during interactive state changes and we can apply
screen on blocking during screen state changes.

Moved the code which manages screen on blocking (which is what
ensures the UI has fully drawn before revealing screen contents)
from the power manager to the display manager since the display
manager is in a better position to accurately track the state of
the screen, particularly when the screen is being turned off.

Fixed a bunch of synchronization issues.  Previously some work
had been moved to a handler without considering what might
happen if it became reordered relative to other work happening
elsewhere.  Documented the desired behavior in the code to
prevent this from happening again.

There's still a bunch of stuff in here that isn't quite right,
particularly the assumption that there's only one screen, but
it's good enough for now.  Hopefully there aren't too many bugs.

Bug: 17605802
Change-Id: Ic7319e09948c8a3cda014d7e169c964a3ad86f14
 2014-09-23 09:38:05 -07:00
Jeff Brown
a273924b8c Ensure wakelock is released unconditionally. 
Bug: 17610254
Change-Id: I8b846c867edaa5038e34d4c857550735b121a1d9
 2014-09-23 09:38:04 -07:00
Jeff Vander Stoep
bba797957a am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '25c866a8efa148886280b34c0413a1c2c20c247f':
  Sanity-check paths of files to be restored
 2014-09-23 16:34:53 +00:00
Jeff Vander Stoep
25c866a8ef am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit 'e2adb1ff4af09d66096df64461c80d4126ab2692':
  Sanity-check paths of files to be restored
 2014-09-23 16:24:36 +00:00
Jeff Vander Stoep
e2adb1ff4a Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 2014-09-23 16:13:42 +00:00
George Mount
9296bcc75f am 27b46d35: am a17365ef: am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit '27b46d350dcd89efde25dc1e0bae35156a6c1346':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 15:53:42 +00:00
Selim Cinek
b3f22d3c4b am 51bc3416: am e9d27cb2: am d6a4bd90: am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit '51bc341620f3aa7e63f5dd33954ececf9503f6cf':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 15:53:38 +00:00
Adrian Roos
3da2015467 am 2d9f7f57: am a2145ac0: am 034d1d03: am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit '2d9f7f573e5255a84b74da923124f3cac1f094a7':
  Ensure that force lock works with accessibility enabled
 2014-09-23 15:53:29 +00:00
Paul Jensen
32bcf376ad am 4d8b2f76: am b3322d8a: am f1980965: am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit '4d8b2f76b3a144de3656001a3d42cf08c6e39bc3':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 15:53:12 +00:00
Ricardo Cervera
4672758947 am d4880677: am 22f28c1c: am 63bff695: am a4d80ca2: am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit 'd488067718c69dd3e946740049967dc07e931392':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-23 15:52:18 +00:00
David Friedman
e30e4c9ecb am 48d50e56: am 20285cdf: am a80fa7a4: am 1695d3de: am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit '48d50e56ab6243f8c72b69ebee90d208404d37b7':
  Fixes two typos, one in each file.
 2014-09-23 15:52:13 +00:00
Chris Craik
3bf8c64d78 am 808583ff: am 1918d884: am a0d0798a: am 737dfe57: Merge "Reject transparent draws more conservatively" into lmp-dev 
* commit '808583ffbbb461c429a8308034dba632d167f2c6':
  Reject transparent draws more conservatively
 2014-09-23 15:51:57 +00:00
Vinit Deshpande
28a15a1fe0 am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 
* commit '6839bf68d8f557e7d31410a3f88f2e32a4f1a2b8':
  Fix documentation for Wifi ScanResult.timestamp
 2014-09-23 15:51:52 +00:00
Lorenzo Colitti
11ebb69d50 am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'd0d59156e69d9f33eea68e783b2835867bdaa67f':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 15:51:32 +00:00
Amith Yamasani
02f6a62d44 am a9d87e8d: am dc8079ac: am 92ab28b1: am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit 'a9d87e8d1f869099a0b9cf75ecfc1e7dfe2982b1':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 15:51:26 +00:00
Dianne Hackborn
3e094bd9cf am 5e956370: am 77b6a9bf: am 2b2e213c: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit '5e956370a5aea436bd18c490f6c3ac8061d62e89':
  I am such an idiot.
 2014-09-23 15:51:19 +00:00
Yuncheol Heo
51f0290a42 am 5f024c13: am 8705586c: Merge "Fix the hotplug behaviors in TV." into lmp-mr1-dev 
* commit '5f024c135ea8ccd93f5201a9d47bb4407cb51475':
  Fix the hotplug behaviors in TV.
 2014-09-23 15:51:13 +00:00
Yigit Boyar
1138c2ffec am 15101435: am 598dc534: am 33e2fd32: am 35b32c80: Merge "Remove unnecessary waits in TouchUtil\'s drag" into lmp-dev 
* commit '1510143574542bc9d412c3aed71039ca4702b5f9':
  Remove unnecessary waits in TouchUtil's drag
 2014-09-23 15:51:09 +00:00
Amit Mahajan
c78b729355 am 02f897a9: am 316c7729: am 4936c2c8: am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit '02f897a954c14855cd142cade2065901134973da':
  Don't disconnect data for some carrier
 2014-09-23 15:50:55 +00:00
xinhe
f7d75f26f4 am cad7b8cd: am ec6b28c3: am e66681ff: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'cad7b8cd31e936337a63f9309c2934607d7493d2':
  Fix for empty RSSI triangle after boot
 2014-09-23 15:50:37 +00:00
Ruben Brunk
0498c04857 am 04ddd954: am c947ff9e: am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit '04ddd954e3ccad653441762d1f289b2945dc061e':
  camera2: Docs update for available AF modes.
 2014-09-23 15:50:33 +00:00
Ruben Brunk
79a7e78c0d am b95f6de6: am 6b68644e: am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit 'b95f6de6a4b23b7e95c61446f4879dbedf444156':
  camera2: Add missing whitebalance mapping.
 2014-09-23 15:50:27 +00:00
Alan Viverette
a83de9cf9d am 17cdbe10: am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '17cdbe10616e38450064d758232f78c7cacc83f4':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 15:50:22 +00:00
Ruben Brunk
e2120388c8 am 969be13e: am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit '969be13ecc9ec7d9e35575d46f22fdd2da5866af':
  camera2: Avoid spurious IDLE transitions.
 2014-09-23 15:49:58 +00:00
Adam Lesinski
467475bab8 am 6b746c15: am 6c7ca6f5: am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 
* commit '6b746c150c7ec6ca41346224a0bc4a4d4910a472':
  Revert behavior of Lockscreen Activity Launch to KK
 2014-09-23 15:49:54 +00:00