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

Commit 562b5ce0 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "AppErrors: Remove ANR broadcast"

parents 96dc1638 86cb6392

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

+1 −10
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.am; 


import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;



import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;

import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.am.ActivityManagerService.MY_PID;
@@ -27,7 +28,6 @@ import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_N 


import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.AppOpsManager;

import android.app.ApplicationErrorReport;

import android.app.Dialog;

import android.content.ActivityNotFoundException;
@@ -835,15 +835,6 @@ class AppErrors { 
                return;

            }



            Intent intent = new Intent("android.intent.action.ANR");

            if (!mService.mProcessesReady) {

                intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY

                        | Intent.FLAG_RECEIVER_FOREGROUND);

            }

            mService.broadcastIntentLocked(null, null, intent,

                    null, null, 0, null, null, null, AppOpsManager.OP_NONE,

                    null, false, false, MY_PID, Process.SYSTEM_UID, 0 /* TODO: Verify */);



            boolean showBackground = Settings.Secure.getInt(mContext.getContentResolver(),

                    Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0;

            if (mService.mAtmInternal.canShowErrorDialogs() || showBackground) {