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

Merge "Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)" into nyc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2016-06-23 03:04:25 +00:00
committed by Android (Google) Code Review
parent 42147f0ff3 17c77536ec
commit 576e6d27bd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1072,6 +1072,7 @@ public final class LoadedApk {
final class Args extends BroadcastReceiver.PendingResult implements Runnable { final class Args extends BroadcastReceiver.PendingResult implements Runnable {
private Intent mCurIntent; private Intent mCurIntent;
private final boolean mOrdered; private final boolean mOrdered;
private boolean mDispatched;
public Args(Intent intent, int resultCode, String resultData, Bundle resultExtras, public Args(Intent intent, int resultCode, String resultData, Bundle resultExtras,
boolean ordered, boolean sticky, int sendingUser) { boolean ordered, boolean sticky, int sendingUser) {
@@ -1096,9 +1097,13 @@ public final class LoadedApk {
final IActivityManager mgr = ActivityManagerNative.getDefault(); final IActivityManager mgr = ActivityManagerNative.getDefault();
final Intent intent = mCurIntent; final Intent intent = mCurIntent;
mCurIntent = null; if (intent == null) {
Log.wtf(TAG, "Null intent being dispatched, mDispatched=" + mDispatched);
}
if (receiver == null || mForgotten) { mCurIntent = null;
mDispatched = true;
if (receiver == null || intent == null || mForgotten) {
if (mRegistered && ordered) { if (mRegistered && ordered) {
if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG, if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG,
"Finishing null broadcast to " + mReceiver); "Finishing null broadcast to " + mReceiver);