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

Commit cb443c52 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't try to show crash dialog if lock screen is showing." into nyc-mr1-dev

parents 6c3f26e5 9645b0ff
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -641,7 +641,8 @@ public final class ActivityManagerService extends ActivityManagerNative
    boolean mDoingSetFocusedActivity;
    public boolean canShowErrorDialogs() {
        return mShowDialogs && !mSleeping && !mShuttingDown;
        return mShowDialogs && !mSleeping && !mShuttingDown
                && mLockScreenShown != LOCK_SCREEN_SHOWN;
    }
    private static final class PriorityState {
+1 −6
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import com.android.internal.logging.MetricsProto;
import com.android.internal.os.ProcessCpuTracker;
import com.android.server.Watchdog;

import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityOptions;
import android.app.ActivityThread;
@@ -33,10 +32,7 @@ import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageDataObserver;
import android.content.pm.PackageManager;
import android.os.Binder;
import android.os.Bundle;
import android.os.Message;
import android.os.Process;
import android.os.RemoteException;
@@ -59,7 +55,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Set;
import java.util.concurrent.Semaphore;

import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ANR;
@@ -359,7 +354,7 @@ class AppErrors {
                return;
            }

            Message msg = Message.obtain();
            final Message msg = Message.obtain();
            msg.what = ActivityManagerService.SHOW_ERROR_UI_MSG;

            task = data.task;