Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix more of issue #28689719: Runtime restart" into nyc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2016-06-09 22:16:26 +00:00
committed by Android (Google) Code Review
parent 52e323bd38 41bfaf870e
commit 4781525399
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/LoadedApk.java
View File

@@ -1191,14 +1191,18 @@ public final class LoadedApk {
public void performReceive(Intent intent, int resultCode, String data, public void performReceive(Intent intent, int resultCode, String data,
Bundle extras, boolean ordered, boolean sticky, int sendingUser) { Bundle extras, boolean ordered, boolean sticky, int sendingUser) {
final Args args = new Args(intent, resultCode, data, extras, ordered,
sticky, sendingUser);
if (intent == null) {
Log.wtf(TAG, "Null intent received");
} else {
if (ActivityThread.DEBUG_BROADCAST) { if (ActivityThread.DEBUG_BROADCAST) {
int seq = intent.getIntExtra("seq", -1); int seq = intent.getIntExtra("seq", -1);
Slog.i(ActivityThread.TAG, "Enqueueing broadcast " + intent.getAction() + " seq=" + seq Slog.i(ActivityThread.TAG, "Enqueueing broadcast " + intent.getAction()
+ " to " + mReceiver); + " seq=" + seq + " to " + mReceiver);
} }
Args args = new Args(intent, resultCode, data, extras, ordered, }
sticky, sendingUser); if (intent == null || !mActivityThread.post(args)) {
if (!mActivityThread.post(args)) {
if (mRegistered && ordered) { if (mRegistered && ordered) {
IActivityManager mgr = ActivityManagerNative.getDefault(); IActivityManager mgr = ActivityManagerNative.getDefault();
if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG, if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG,