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

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

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

am: 47815253

Change-Id: I554724ec2a8198dba1189972dd89ae9edc787162
parents 4676cc96 47815253

core/java/android/app/LoadedApk.java

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

            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) {

                    int seq = intent.getIntExtra("seq", -1);

                Slog.i(ActivityThread.TAG, "Enqueueing broadcast " + intent.getAction() + " seq=" + seq

                        + " to " + mReceiver);

                    Slog.i(ActivityThread.TAG, "Enqueueing broadcast " + intent.getAction()

                            + " seq=" + seq + " to " + mReceiver);

                }

            Args args = new Args(intent, resultCode, data, extras, ordered,

                    sticky, sendingUser);

            if (!mActivityThread.post(args)) {

            }

            if (intent == null || !mActivityThread.post(args)) {

                if (mRegistered && ordered) {

                    IActivityManager mgr = ActivityManagerNative.getDefault();

                    if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG,