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

Commit a11ee6ea authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge \"Merge \\"Fix issue #29532165: System Server Java Crashes in WiFi (RT... 

Merge \"Merge \\"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\\" into nyc-dev am: 576e6d27\" into nyc-mr1-dev
am: fb801df2

Change-Id: I2b8a35c2e4f411506c89964d5e8c4a34a23c534e
parents fc10f2bf fb801df2

core/java/android/app/LoadedApk.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -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);