Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bb0ae0d authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Add null test and remove redundant call."

parents 7504beda f06b8c17

services/java/com/android/server/wm/WindowManagerService.java

+0 −1
Original line number Diff line number Diff line
@@ -2380,7 +2380,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                updateFocusedWindowLocked(UPDATE_FOCUS_WILL_PLACE_SURFACES,

                        false /*updateInputWindows*/);

                performLayoutAndPlaceSurfacesLocked();

                mInputMonitor.updateInputWindowsLw(false /*force*/);

                if (win.mAppToken != null) {

                    win.mAppToken.updateReportedVisibilityLocked();

                }

services/java/com/android/server/wm/WindowState.java

+4 −1
Original line number Diff line number Diff line
@@ -698,7 +698,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { 


    TaskStack getStack() {

        if (mAppToken != null) {

            return mService.mTaskIdToTask.get(mAppToken.groupId).mStack;

            Task task = mService.mTaskIdToTask.get(mAppToken.groupId);

            if (task != null) {

                return task.mStack;

            }

        }

        return null;

    }