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

Commit 10656854 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick
Browse files

Fix potential weird StrictMode NPE. 

Seen once in an eng build.  Could in theory happen if there was a
violation in the system server before the activity manager was
registered.

Change-Id: I785f06848af0e2af4657be3a8edbbd658eeb3cf2
parent 83f5eccb

core/java/android/os/StrictMode.java

+10 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.animation.ValueAnimator; 
import android.app.ActivityManagerNative;

import android.app.ActivityThread;

import android.app.ApplicationErrorReport;

import android.app.IActivityManager;

import android.content.Intent;

import android.util.Log;

import android.util.Printer;
@@ -1091,11 +1092,15 @@ public final class StrictMode { 
            public void run() {

                Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);

                try {

                    ActivityManagerNative.getDefault().

                            handleApplicationStrictModeViolation(

                    IActivityManager am = ActivityManagerNative.getDefault();

                    if (am == null) {

                        Log.d(TAG, "No activity manager; failed to Dropbox violation.");

                    } else {

                        am.handleApplicationStrictModeViolation(

                            RuntimeInit.getApplicationObject(),

                            violationMaskSubset,

                            info);

                    }

                } catch (RemoteException e) {

                    Log.e(TAG, "RemoteException handling StrictMode violation", e);

                }