From 41bfaf870eacf1485c76085e543f354b30b88345 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 8 Jun 2016 16:33:29 -0700 Subject: [PATCH] Fix more of issue #28689719: Runtime restart Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993 --- core/java/android/app/LoadedApk.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 152f45e352873..0b62ed2b09171 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -1191,14 +1191,18 @@ public final class LoadedApk { public void performReceive(Intent intent, int resultCode, String data, Bundle extras, boolean ordered, boolean sticky, int sendingUser) { - if (ActivityThread.DEBUG_BROADCAST) { - int seq = intent.getIntExtra("seq", -1); - Slog.i(ActivityThread.TAG, "Enqueueing broadcast " + intent.getAction() + " seq=" + seq - + " to " + mReceiver); - } - Args args = new Args(intent, resultCode, data, extras, ordered, + final Args args = new Args(intent, resultCode, data, extras, ordered, sticky, sendingUser); - if (!mActivityThread.post(args)) { + if (intent == null) { + Log.wtf(TAG, "Null intent received"); + } else { + if (ActivityThread.DEBUG_BROADCAST) { + int seq = intent.getIntExtra("seq", -1); + Slog.i(ActivityThread.TAG, "Enqueueing broadcast " + intent.getAction() + + " seq=" + seq + " to " + mReceiver); + } + } + if (intent == null || !mActivityThread.post(args)) { if (mRegistered && ordered) { IActivityManager mgr = ActivityManagerNative.getDefault(); if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG,