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

Commit 6a718af8 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Prevents the binder call fail from freeze when send app visibility."... 

Merge "Prevents the binder call fail from freeze when send app visibility." into tm-dev am: 293ac013 am: 472751b2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17464643



Change-Id: I33ad6e2d15f1b688fed2ee9b9e30de16102ac979
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59f9ba44 472751b2

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

+3 −0
Original line number Diff line number Diff line
@@ -1403,6 +1403,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                            + "activityRecord=%s", this);

            return false;

        }

        if (onTop) {

            app.addToPendingTop();

        }

        try {

            ProtoLog.v(WM_DEBUG_STATES, "Sending position change to %s, onTop: %b",

                    this, onTop);

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

+1 −0
Original line number Diff line number Diff line
@@ -1232,6 +1232,7 @@ class TaskFragment extends WindowContainer<WindowContainer> { 


            // This activity is now becoming visible.

            if (!next.mVisibleRequested || next.stopped || lastActivityTranslucent) {

                next.app.addToPendingTop();

                next.setVisibility(true);

            }

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

+1 −0
Original line number Diff line number Diff line
@@ -3519,6 +3519,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                    "Setting visibility of " + this + ": " + clientVisible);

            mClient.dispatchAppVisibility(clientVisible);

        } catch (RemoteException e) {

            Slog.w(TAG, "Exception thrown during dispatchAppVisibility " + this, e);

        }

    }