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

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

Don't try to show crash dialog if lock screen is showing. am: 9645b0ff

am: dbda5ec6

Change-Id: If65c58a5f1f4e2fd32e4bf0b74bf0edbaa37f77d
parents a2aa9aea dbda5ec6
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;