diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-01 16:38:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-01 16:38:14 +0000 |
| commit | ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3 (patch) | |
| tree | 4677c6e8a6ac6e9de6ed2e34ad8a959202c6c9d2 | |
| parent | 6829daa44a66333ef869dbcd655eac220c34561b (diff) | |
| parent | e3ca04839783c8cd30fe1009f041f81615adec5d (diff) | |
| download | frameworks_base-ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3.zip frameworks_base-ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3.tar.gz frameworks_base-ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3.tar.bz2 | |
Merge "Avoid capture all black screenshot bitmap"
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 7f7d93b..1c03ced 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -6101,7 +6101,7 @@ public class WindowManagerService extends IWindowManager.Stub } if (ws.mAppToken != null && ws.mAppToken.token == appToken && - ws.isDisplayedLw()) { + ws.isDisplayedLw() && winAnim.mSurfaceShown) { screenshotReady = true; } |