diff options
| author | Craig Mautner <cmautner@google.com> | 2014-05-23 13:28:40 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-05-24 09:54:36 -0700 |
| commit | 1f74bad9acd816cd0974ca7d8a9eafe7f671ee57 (patch) | |
| tree | 58a67b0e9383c29c4f880563347246fdb80e37b9 /services | |
| parent | 026596b938e4f078b2db95a523bf55dd0704c1dd (diff) | |
| download | frameworks_base-1f74bad9acd816cd0974ca7d8a9eafe7f671ee57.zip frameworks_base-1f74bad9acd816cd0974ca7d8a9eafe7f671ee57.tar.gz frameworks_base-1f74bad9acd816cd0974ca7d8a9eafe7f671ee57.tar.bz2 | |
Check for null DO NOT MERGE
Fixes bug 15129354.
Change-Id: I88865c021a024ab94e44dc71f09f8325a79e0775
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 6fbb39d..c23d1ea 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -3189,6 +3189,7 @@ public class WindowManagerService extends IWindowManager.Stub WindowState win = atoken.findMainWindow(); Rect containingFrame = new Rect(0, 0, width, height); Rect contentInsets = new Rect(); + boolean isFullScreen = true; if (win != null) { if (win.mContainingFrame != null) { containingFrame.set(win.mContainingFrame); @@ -3196,11 +3197,11 @@ public class WindowManagerService extends IWindowManager.Stub if (win.mContentInsets != null) { contentInsets.set(win.mContentInsets); } + isFullScreen = + ((win.mSystemUiVisibility & SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN) == + SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN); } - boolean isFullScreen = - ((win.mSystemUiVisibility & SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN) - == SYSTEM_UI_FLAGS_LAYOUT_STABLE_FULLSCREEN); Animation a = mAppTransition.loadAnimation(lp, transit, enter, width, height, mCurConfiguration.orientation, containingFrame, contentInsets, isFullScreen); if (a != null) { |