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

Commit eb615f88 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Added input freeze reason string." into nyc-dev 

am: deee942b

* commit 'deee942b':
  Added input freeze reason string.
parents 624c9171 deee942b

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

+17 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; 


import android.app.ActivityManagerNative;

import android.graphics.Rect;

import android.os.Debug;

import android.os.RemoteException;

import android.util.Log;

import android.util.Slog;
@@ -36,6 +37,7 @@ import com.android.server.input.InputApplicationHandle; 
import com.android.server.input.InputManagerService;

import com.android.server.input.InputWindowHandle;



import java.io.PrintWriter;

import java.util.Arrays;



final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
@@ -47,6 +49,9 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { 
    // When true, prevents input dispatch from proceeding until set to false again.

    private boolean mInputDispatchFrozen;



    // The reason the input is currently frozen or null if the input isn't frozen.

    private String mInputFreezeReason = null;



    // When true, input dispatch proceeds normally.  Otherwise all events are dropped.

    // Initially false, so that input does not get dispatched until boot is finished at

    // which point the ActivityManager will enable dispatching.
@@ -480,6 +485,10 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { 
            }



            mInputDispatchFrozen = true;



            if (DEBUG_INPUT || true) {

                mInputFreezeReason = Debug.getCallers(6);

            }

            updateInputDispatchModeLw();

        }

    }
@@ -491,6 +500,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { 
            }



            mInputDispatchFrozen = false;

            mInputFreezeReason = null;

            updateInputDispatchModeLw();

        }

    }
@@ -509,4 +519,10 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { 
    private void updateInputDispatchModeLw() {

        mService.mInputManager.setInputDispatchMode(mInputDispatchEnabled, mInputDispatchFrozen);

    }



    void dump(PrintWriter pw, String prefix) {

        if (mInputFreezeReason != null) {

            pw.println(prefix + "mInputFreezeReason=" + mInputFreezeReason);

        }

    }

}

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

+3 −0
Original line number Diff line number Diff line
@@ -9913,6 +9913,9 @@ public class WindowManagerService extends IWindowManager.Stub 
                    pw.print(mLastFinishedFreezeSource);

                }

                pw.println();



        mInputMonitor.dump(pw, "  ");



        if (dumpAll) {

            pw.print("  mSystemDecorLayer="); pw.print(mSystemDecorLayer);

                    pw.print(" mScreenRect="); pw.println(mScreenRect.toShortString());