7619 Commits

Author SHA1 Message Date
Dave Burke
2696d0520f am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0
* commit '70ac412b2fe7be2507189a9fdfb30c43b36d56ac':
  Add a LayerScreenshot
2011-10-18 23:00:08 -07:00
Dave Burke
70ac412b2f Merge "Add a LayerScreenshot" into ics-mr0 2011-10-18 22:58:09 -07:00
Dave Burke
3254774b92 am d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
* commit 'd7035c58b006b62084232c8db6c4f7c4002170cc':
  Fix a hang in SF caused by invalid transform matrix from the WM
2011-10-18 22:34:51 -07:00
Dave Burke
d7035c58b0 Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0 2011-10-18 22:33:40 -07:00
Mathias Agopian
960a0b4813 am f7613743: Merge "Don\'t call hwc set() if there is nothing new to do" into ics-mr0
* commit 'f7613743f29f38cbbaf4ae09996c380845a17daf':
  Don't call hwc set() if there is nothing new to do
2011-10-18 20:24:23 -07:00
Mathias Agopian
43d109c2c8 am 23bf2505: Merge "Make sure set GL state properly" into ics-mr0
* commit '23bf250522b7dff9acd14c5900b66b1df9c76745':
  Make sure set GL state properly
2011-10-18 20:24:21 -07:00
Mathias Agopian
f7613743f2 Merge "Don't call hwc set() if there is nothing new to do" into ics-mr0 2011-10-18 20:23:22 -07:00
Mathias Agopian
23bf250522 Merge "Make sure set GL state properly" into ics-mr0 2011-10-18 20:23:15 -07:00
Mathias Agopian
0ab84ef507 Add a LayerScreenshot
A LayerScreenshot is a special type of layer that contains a screenshot of
the screen acquired when its created. It works just like LayerDim.

Make sure to call compositionComplete() after rendering into a FBO.

Bug: 5446982, 5467587, 5466259
Change-Id: I5d8a1b4c327f9973d950cd4f4c0bca7f62825cd4
2011-10-18 20:21:47 -07:00
Mathias Agopian
526f0a0e15 Fix a hang in SF caused by invalid transform matrix from the WM
WindowManager could create by transforms because of divide by zero.

Bug: 5422468
Change-Id: I782f87ebb78b5ff23750e22837f36ca6cfed1f2f
2011-10-18 20:21:47 -07:00
Eric Laurent
a6f4fb1fbb am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0
* commit 'ecfdd7ff468bfc861e84fe18992e26b89cc63126':
  Limit AudioFlinger log.
2011-10-18 19:31:12 -07:00
Eric Laurent
ecfdd7ff46 Merge "Limit AudioFlinger log." into ics-mr0 2011-10-18 19:29:39 -07:00
Mathias Agopian
0d0fba4587 Don't call hwc set() if there is nothing new to do
there was situations where SF's main loop would run (as if there was
an invalidate), but the dirty region was empty (so no new buffers
were retired). In this case we return early and don't swap, which
would cause drawing artifacts.

Bug: 5476838
Change-Id: Id3b7bf4b7aabec7919c50d9278eb2165973a4c3d
2011-10-18 17:39:09 -07:00
Eric Laurent
276fa43b98 Limit AudioFlinger log.
AudioFlinger logs a warning when a write to the audio HAL
takes too long to return. The threshold for this warning is
a rule of thumb based on the assumption that the audio HAL will consume
buffers at a regular pace.
The introduction of low power audio mode with larger buffers and writes
occuring in bursts makes that this threshold is often exceeded resulting
in excessive and misleading warnings.

The threshold is raised to remove unwanted warnings but we should reconsider
the usefulness of this warning altogether.

Change-Id: I5ef6898ea28d879cede3e47da542a64092a3cca4
2011-10-18 15:42:27 -07:00
Mathias Agopian
9044ef05d5 Make sure set GL state properly
when taking a screenshot, in particular, we could end up
with stale GL state when drawing LayerDim which resulted
in incortect rendering.

Bug: 5467587
Change-Id: Id9fbed2843481d31063620f3662b364c7e3ac781
2011-10-18 15:32:57 -07:00
Dianne Hackborn
06f3e84595 am 535f6eac: Merge "Fix issue #5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500" into ics-mr0
* commit '535f6eacb9bd508caac463a12ab69be1cd58c5a5':
  Fix issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
2011-10-18 14:36:31 -07:00
Dianne Hackborn
98cfebc6e8 Fix issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
The basic problem was that at some points during setup wizard, this would
happen:

1. The app's process is killed.
2. The app's process is restarted, but not to actually resume the
   setup wizard activity, just to put it in the stopped state.
   When doing this, the saved state is cleared but the app will
   never provide a new one.
3. The app's process is killed again.  At this point, because the
   saved state is cleared, the activity is completely removed.
4. Eventually the entire activity stack becomes empty, and a new
   setup wizard activity needs to be created as the home app.

There is a combination of bad stuff going on here.

First, why is the process being killed?  At this point the setup
wizard is the home app, so it shouldn't be killed.  There were two
reasons why this was happening:

- CryptKeeper still was not completely cleanly going away.  To fix
  this, I removed the check in the activity manager to not allow
  an activity to finish if it is the only activity on the stack and
  maybe-kindof looks like the home app.  This really wasn't necessary
  (we always take care of starting a new home activity if we find the
  stack is empty), and outright dangerous with all of these things
  purporting to be home but not.

- There was an issue in computing the oom_adj where the home app
  would not be marked as "not hidden", and if we had to re-compute
  its oom adj in the current sequence would then give it an
  adjustment as a background process...  and with all the processes
  we spin through during boot, it quickly got down to background
  #16 and killed.

Second, what is going on with the state?  This is easier, the code
in the activity manager to create a new activity but put it in the
stopped state was still clearing the saved state.  The saved state
should only be cleared when going in to the resumed state.  When
going in to the stopped state, we can just keep holding the same
saved state.

Change-Id: I7d21cdcfa082d98ca70c79d9923e29605ee4353e
2011-10-18 13:41:10 -07:00
Svetoslav Ganov
12ca1fa78a am 601d5817: Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0
* commit '601d5817301bc79c34c30e7b606fe872b2b76c31':
  TouchExplorer crashes if there is incative pointer while dragging.
2011-10-18 11:54:03 -07:00
Svetoslav Ganov
d8581c7a61 TouchExplorer crashes if there is incative pointer while dragging.
The TouchExplorer was not taking into account the case with incative
pointers while dragging. If one puts a finger down and then perfroms
a dragging gestore the explorer tries to inject UP event for the end
of the gesture upon every of the two dragging pointers going up instead
only for one the first went up.

bug:5476098

Change-Id: I20d2dd7bde7e016b0678a35d14cd068d9ff37023
2011-10-18 11:28:52 -07:00
Ben Komalo
ed48c8b4f5 Fix remote device wipe to not hang.
The DPM seemed to always go through ExternalStorageFormatter to wipe the
device and SD card. For SD cards emulated on a fuse filesystem, this
seems to fail unless the device is wholly encrypted. Bypass
ExternalStorageFormatter in those cases and just wipe as normal.

Bug: 5458396
Change-Id: Iec759ef894c6bd3863cb4e7329f4de4584c60c1a
2011-10-18 10:13:34 -07:00
Chih-Chung Chang
21ad1d1cb0 am a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0
* commit 'a84e37f37c7cd21fe498a923c181d3896e055d56':
  Fix 5468644: Use the proper audio stream type to play sound.
2011-10-17 19:42:14 -07:00
Chih-Chung Chang
a84e37f37c Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0 2011-10-17 19:40:12 -07:00
Jeff Sharkey
2789e257fc am 31603aac: Merge "Validate commands and arguments." into ics-mr0
* commit '31603aacbb54b98cbee498412f6a5eb9dd4a2788':
  Validate commands and arguments.
2011-10-17 15:31:10 -07:00
Jeff Sharkey
b0aec07f74 Validate commands and arguments.
Bug: 5465176
Change-Id: I9402054c20ea6cae42781c35bfc2ade90aac31ce
2011-10-17 14:51:42 -07:00
Dianne Hackborn
88217fea8a am c047f60d: Merge "Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0
* commit 'c047f60db277252f8921b88c82df1a8812afb169':
  Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes
2011-10-17 11:32:51 -07:00
Mathias Agopian
a3dca6fdaa am 840b8a67: Revert "Add a LayerScreenshot"
* commit '840b8a678537519c27ddf2f818494eaa20a135d4':
  Revert "Add a LayerScreenshot"
2011-10-17 11:32:19 -07:00
Mathias Agopian
f7ae86f61b am 4fb6416e: Merge "we need to guarantee that h/w comp set() is called when a buffer has been retired" into ics-mr0
* commit '4fb6416e3a21031a88921a784ae62b13d8a1a39f':
  we need to guarantee that h/w comp set() is called when a buffer has been retired
2011-10-17 11:32:16 -07:00
Elliott Hughes
f21dd1eabe Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-10-17 11:32:08 -07:00
Mathias Agopian
4b1415ebd9 am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0
* commit '57337eb78e65c160fb9c46a01e04c476d1bfdca1':
  Add a LayerScreenshot
2011-10-17 11:30:33 -07:00
Dianne Hackborn
71e14da93c Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes
Only unbind once.

Also protection from removing a SpellCheckerBindGroup from mSpellCheckerBindGroups
if it is no longer the current entry there.

Change-Id: Ic585295dfae77eae101a611afbf116bc681290ad
2011-10-17 10:21:25 -07:00
Chih-Chung Chang
4091f0ba08 Fix 5468644: Use the proper audio stream type to play sound.
Change-Id: I80dd37da277b1810959a2dbdd852078b26f70cf5
2011-10-17 19:04:00 +08:00
Mathias Agopian
840b8a6785 Revert "Add a LayerScreenshot"
This reverts commit d6809f40cf61203573ec5dbc437f695cd132cc18.
2011-10-16 23:54:25 -07:00
Mathias Agopian
e757a87ff1 we need to guarantee that h/w comp set() is called when a buffer has been retired
removed a test that could violate this guarantee. note that we
have no proof tha this ever happened, but consequences could be
hard lock-ups.

the code here was intended to track the region to update for displays
that can do partial update. the logic discarded the update entirely
if that region was empty. instead we just redraw the whole thing
(note that we should never be there with an empty region and retired
buffers though).

Bug: 5466259

Change-Id: I91ccab3b1a599e729e438eb833939e2236da6854
2011-10-16 18:59:38 -07:00
Jamie Gennis
de14ecaebc SurfaceFlinger: Remove display freezing code
This change removes the dead code from SurfaceFlinger that resulted from
disabling support for freezing the display.

Change-Id: I4e5ff00c94b4c7a79af2f65c9850c135210068ed
2011-10-14 16:44:08 -07:00
Jamie Gennis
4f1924380c SurfaceFlinger: add some layer update tests
This change adds two tests for SurfaceFlinger's behavior when updating
the position and size of a layer.

Change-Id: Id5e3ca1d7e629a3bd2c2d28275d80c7f9256d6da
2011-10-14 16:11:51 -07:00
Jamie Gennis
122aa6bae9 SurfaceFlinger: make sync transactions explicit
This change enables a layer or orientation update transaction sent to
SurfaceFlinger to explicitly request a synchronous transaction.

Change-Id: I97cbba610c13679849f66114b216fa6dbf12f2a9
2011-10-14 16:11:51 -07:00
Mathias Agopian
57337eb78e Merge "Add a LayerScreenshot" into ics-mr0 2011-10-14 15:35:54 -07:00
Mathias Agopian
d6809f40cf Add a LayerScreenshot
A LayerScreenshot is a special type of layer that contains a screenshot of
the screen acquired when its created. It works just like LayerDim.

Bug: 5446982
Change-Id: I7814aff2380e7e146937f2b641907be2a30c76cc
2011-10-14 14:32:48 -07:00
Christopher Tate
8f4e49a8fe Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0 2011-10-14 10:33:13 -07:00
Wink Saville
d54bcad4bb am 8a058cbf: Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0
* commit '8a058cbf12c590db810fe8d9fab6f4f614909329':
  In releaseWifiLockLocked call noteReleaseWifiLock.
2011-10-13 17:42:58 -07:00
Wink Saville
8a058cbf12 Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0 2011-10-13 17:40:01 -07:00
Christopher Tate
b9c1acfb0b DO NOT MERGE - Require device encryption password for adb backup/restore
This supersedes any backup-password that the user might supply.  Per
design, the device encryption password is also always used to encrypt
the backup archive.

The CL introduces two new strings, used for prompting the user for
their device encryption password rather than their settings-defined
"backup password" when confirming a full backup or restore operation.

Bug 5382487

Change-Id: I278737927a4ecbb765bfb5ecfd28a4cb8dae52ef
2011-10-13 17:39:48 -07:00
Wink Saville
ce0ea1f2b9 In releaseWifiLockLocked call noteReleaseWifiLock.
Bug: 5452027
Change-Id: I45786a9cfe752f02a9c2e75e5b6f35bc5dfed6ae
2011-10-13 16:55:20 -07:00
Dianne Hackborn
d09289ed80 am 97e9ea98: Merge "Fix bug with CLEAR_TASK -- wouldn\'t clear the top activity." into ics-mr0
* commit '97e9ea98afac197722d7620d5fd09a8c06aafe3a':
  Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
2011-10-13 16:45:56 -07:00
Dianne Hackborn
97e9ea98af Merge "Fix bug with CLEAR_TASK -- wouldn't clear the top activity." into ics-mr0 2011-10-13 16:44:26 -07:00
Dianne Hackborn
eabd328dee Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
Maybe this will also fix bug #5144065 as well.

I doubt I am so lucky, though.

Change-Id: I60bf595d3eff79353fdd94b0f2a089e81218bc30
2011-10-13 16:26:49 -07:00
Christopher Tate
28e9046ed4 Merge "Require device encryption password to perform adb backup/restore" 2011-10-13 14:06:22 -07:00
Mike Lockwood
6982847062 am ab9d5b11: Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0
* commit 'ab9d5b11737f8a460467657035186bcfa7085eb9':
  PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled.
2011-10-13 14:01:23 -07:00
Mike Lockwood
ab9d5b1173 Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0 2011-10-13 13:59:33 -07:00
Adam Cohen
1bbb92deed am c408a5d5: Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0
* commit 'c408a5d5738c84160a7e9a8299c953ea638bcef4':
  Fixing issue where widgets file was getting blown away, issue: 5036321
2011-10-13 13:40:01 -07:00