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

Commit bf2e4a38 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set the Intent class loader for onActivityReenter."

parents 11f41e72 88f6bc82

core/java/android/app/ActivityTransitionState.java

+6 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package android.app;



import android.content.Intent;

import android.os.Bundle;

import android.os.ResultReceiver;

import android.transition.Transition;
@@ -166,7 +167,11 @@ class ActivityTransitionState { 
                restoreExitedViews();

                int result = mEnterActivityOptions.getResultCode();

                if (result != 0) {

                    activity.onActivityReenter(result, mEnterActivityOptions.getResultData());

                    Intent intent = mEnterActivityOptions.getResultData();

                    if (intent != null) {

                        intent.setExtrasClassLoader(activity.getClassLoader());

                    }

                    activity.onActivityReenter(result, intent);

                }

            }

        }