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

Commit a9dca938 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d315 am:... 

Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d315 am: b1a2cde4" into oc-dr1-dev-plus-aosp
am: c5deced1

Change-Id: Ib08956194b971823a44c7ad77791dfcc87362210
parents 856f294e c5deced1

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

+11 −2
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.os.WorkSource;

import android.provider.Settings;

import android.text.format.DateUtils;

import android.util.ArraySet;

import android.util.DisplayMetrics;

import android.util.EventLog;
@@ -3600,8 +3601,16 @@ public class WindowManagerService extends IWindowManager.Stub 
    // only allow disables from pids which have count on, etc.

    @Override

    public void showStrictModeViolation(boolean on) {

        int pid = Binder.getCallingPid();

        mH.sendMessage(mH.obtainMessage(H.SHOW_STRICT_MODE_VIOLATION, on ? 1 : 0, pid));

        final int pid = Binder.getCallingPid();

        if (on) {

            // Show the visualization, and enqueue a second message to tear it

            // down if we don't hear back from the app.

            mH.sendMessage(mH.obtainMessage(H.SHOW_STRICT_MODE_VIOLATION, 1, pid));

            mH.sendMessageDelayed(mH.obtainMessage(H.SHOW_STRICT_MODE_VIOLATION, 0, pid),

                    DateUtils.SECOND_IN_MILLIS);

        } else {

            mH.sendMessage(mH.obtainMessage(H.SHOW_STRICT_MODE_VIOLATION, 0, pid));

        }

    }



    private void showStrictModeViolation(int arg, int pid) {