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

Commit 02b9ef39 authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "Add some logging for buggy calls to AM" into oc-dev 

am: 54a3ce2d

Change-Id: I9b04311e6698dea7c8e19d585270e4b1ed52d45c
parents 28106191 54a3ce2d

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

+4 −1
Original line number Diff line number Diff line
@@ -2908,7 +2908,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
            // The activity manager only throws security exceptions, so let's

            // log all others.

            if (!(e instanceof SecurityException)) {

                Slog.wtf(TAG, "Activity Manager Crash", e);

                Slog.wtf(TAG, "Activity Manager Crash."

                        + " UID:" + Binder.getCallingUid()

                        + " PID:" + Binder.getCallingPid()

                        + " TRANS:" + code, e);

            }

            throw e;

        }

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

+1 −3
Original line number Diff line number Diff line
@@ -2174,9 +2174,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 
    }



    void removeOrphanedStartingWindow(boolean behindFullscreenActivity) {

        if (state == INITIALIZING

                && mStartingWindowState == STARTING_WINDOW_SHOWN

                && behindFullscreenActivity) {

        if (mStartingWindowState == STARTING_WINDOW_SHOWN && behindFullscreenActivity) {

            if (DEBUG_VISIBILITY) Slog.w(TAG_VISIBILITY, "Found orphaned starting window " + this);

            mStartingWindowState = STARTING_WINDOW_REMOVED;

            mWindowContainerController.removeStartingWindow();