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

153136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Vander Stoep
bda5a2deca am bbf7e4af: am 1cf337a2: am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit 'bbf7e4af975493c9c213250a595c63331cb7a872':
  Change permission guard on bindBackupAgent()
 2014-09-23 17:37:42 +00:00
Tyler Gunn
361798d6c1 am aaaa0cf6: am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev 
* commit 'aaaa0cf6a1106aec82f99da5fcae6d584f9dfda6':
  @hide ConnectionService APIs.
 2014-09-23 17:36:41 +00:00
mike dooley
95e8070e29 Fixing ConcurrentModificationException. 
Implementing review feedback.

Bug: 17572658
Change-Id: I3a060d21669a58188a24c5d6ec5fefcbca45a976
 2014-09-23 17:34:10 +00:00
Dianne Hackborn
25e1ecaabb Maybe fix issue #17614177 APR: system process restarting due to infinite loop 
Also try to get rid of a huge wtf we are seeing across a lot of devices
where we incorrectly change real states on a service that is restarting,
and get rid of one of the noisier boot logs in the package manager.

Change-Id: I2510b6fb082eac3f6168cbd57bc3b70ad006114d
 2014-09-23 10:33:30 -07:00
Ruben Brunk
3084c2f519 camera2: Update EACCES to throw correct exception in LEGACY. 
Bug: 17595068
Change-Id: I1a88568822237d3609c3342a21e2ca81ca935408
 2014-09-23 10:32:18 -07:00
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
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 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
00e28744af am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit 'd0f0f86b3a6a8086efc468a0ee8728605cdfc9e3':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 14:44:48 +00:00
Selim Cinek
cdee13f4db am d6a4bd90: am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit 'd6a4bd90e04a7c43abb3611d4e66de60eb5ee2bd':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 14:44:44 +00:00
George Mount
004b7a3f19 am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 
* commit 'cced7645aae3e2fd65297ac75cecfde31dc1c636':
  Force transitioning views to be visible when transition interrupted.
 2014-09-23 14:33:08 +00:00
Selim Cinek
3caab56c21 am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit 'd08372bc89eb0a1de3dee72a270b65b10701aad3':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 14:33:04 +00:00
George Mount
cbd333b256 Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 2014-09-23 14:27:36 +00:00
Selim Cinek
0eba4e279f Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 2014-09-23 14:25:09 +00:00
Adrian Roos
40f918f661 am 034d1d03: am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit '034d1d039b63d0d32d5d29313c354e351888b4b9':
  Ensure that force lock works with accessibility enabled
 2014-09-23 14:10:22 +00:00
Adrian Roos
18321f5337 am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit 'b98fd933fd7c5ca2c75849a013fc942ec211b5ee':
  Ensure that force lock works with accessibility enabled
 2014-09-23 14:00:27 +00:00
Adrian Roos
6ec76b0ff9 Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 2014-09-23 13:48:42 +00:00
Selim Cinek
ba5b3a0b4e Fixed a bug where the alarm could overlap in QS 
When closing the QS panel the alarm did the normal
transformation, regardless whether we were in a
detail state. This lead to the alarm overlapping
with the title.

Bug: 17581501
Change-Id: I0318f6778063af11f388e6c7fe8bbb30105ca246
 2014-09-23 15:39:54 +02:00
Jason Monk
d7bd9d61dc Add missing permission for hotspot QS tile 
Bug: 17589487
Change-Id: I2461450863606758b53d4dccdaad74878909ff6d
 2014-09-23 09:25:29 -04:00
Paul Jensen
337553071a am f1980965: am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit 'f19809653a6601459c5a9167396bb461a6d2ee52':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 12:18:46 +00:00
Paul Jensen
7defcc8590 am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit '1c637c5fef678a82fd1f2c380d41ed6ebcb5bf2e':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 12:08:22 +00:00
Paul Jensen
74971c75dc Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 2014-09-23 12:00:35 +00:00
Ricardo Cervera
93033384aa am 63bff695: am a4d80ca2: am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit '63bff695ac470483781878615bc57b0c8cf42fb6':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-23 04:02:54 +00:00
David Friedman
67b63b799b am a80fa7a4: am 1695d3de: am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit 'a80fa7a4f2ae987daf429a7078806e28e32e05de':
  Fixes two typos, one in each file.
 2014-09-23 04:02:50 +00:00
Ricardo Cervera
d41c62041c am a4d80ca2: am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit 'a4d80ca26d32de6fa73910ed173b577218654cd3':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-23 03:48:45 +00:00
David Friedman
205c86eb66 am 1695d3de: am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit '1695d3de3dad078eff55666cc182943e8f9fbfeb':
  Fixes two typos, one in each file.
 2014-09-23 03:48:40 +00:00
Jay Shrauner
5e6162de62 Fix NPE crash when mPhone is null 
Bug:17609710
Change-Id: Idb99feb6f15fd29809adde51cda1eb0d44e20101
 2014-09-22 20:47:45 -07:00