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

Commit 6e935ac2 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android Git Automerger
Browse files

am ac074435: am fe4680f9: am 354b70f7: Merge "Set non-starting visible resumed... 

am ac074435: am fe4680f9: am 354b70f7: Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev

* commit 'ac074435':
  Set non-starting visible resumed activity as resumed activity for the stack
parents 4a4902a8 ac074435

services/core/java/com/android/server/am/ActivityStack.java

+3 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,9 @@ final class ActivityStack { 
                            }

                        } catch(RemoteException e) {

                        }

                        if (r.state == ActivityState.RESUMED) {

                            noStackActivityResumed = false;

                        }

                    } else {

                        // This activity is not currently visible, but is running.

                        // Tell it to become visible.

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

+1 −2
Original line number Diff line number Diff line
@@ -2345,7 +2345,6 @@ public class WindowManagerService extends IWindowManager.Stub 


        boolean reportNewConfig = false;

        WindowState attachedWindow = null;

        WindowState win = null;

        long origId;

        final int type = attrs.type;
@@ -2482,7 +2481,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                addToken = true;

            }



            win = new WindowState(this, session, client, token,

            WindowState win = new WindowState(this, session, client, token,

                    attachedWindow, appOp[0], seq, attrs, viewVisibility, displayContent);

            if (win.mDeathRecipient == null) {

                // Client has apparently died, so there is no reason to

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

+1 −1
Original line number Diff line number Diff line
@@ -1709,7 +1709,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
                    pw.println(mWallpaperDisplayOffsetY);

        }

        if (mDrawLock != null) {

            pw.println("mDrawLock=" + mDrawLock);

            pw.print(prefix); pw.println("mDrawLock=" + mDrawLock);

        }

    }