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

Commit 08a70e40 authored by Mark Renouf's avatar Mark Renouf Committed by Android (Google) Code Review
Browse files

Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev

parents f7ed36ba 9d5f7103

core/java/com/android/internal/app/chooser/DisplayResolveInfo.java

+2 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.internal.app.ResolverActivity; 
import com.android.internal.app.ResolverListAdapter.ResolveInfoPresentationGetter;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



/**
@@ -206,7 +205,7 @@ public class DisplayResolveInfo implements TargetInfo, Parcelable { 
        dest.writeCharSequence(mDisplayLabel);

        dest.writeCharSequence(mExtendedInfo);

        dest.writeParcelable(mResolvedIntent, 0);

        dest.writeParcelableArray((Intent[]) mSourceIntents.toArray(), 0);

        dest.writeTypedList(mSourceIntents);

        dest.writeBoolean(mIsSuspended);

        dest.writeBoolean(mPinned);

        dest.writeParcelable(mResolveInfo, 0);
@@ -227,9 +226,7 @@ public class DisplayResolveInfo implements TargetInfo, Parcelable { 
        mDisplayLabel = in.readCharSequence();

        mExtendedInfo = in.readCharSequence();

        mResolvedIntent = in.readParcelable(null /* ClassLoader */, android.content.Intent.class);

        mSourceIntents.addAll(

                Arrays.asList((Intent[]) in.readParcelableArray(null /* ClassLoader */,

                        Intent.class)));

        in.readTypedList(mSourceIntents, Intent.CREATOR);

        mIsSuspended = in.readBoolean();

        mPinned = in.readBoolean();

        mResolveInfo = in.readParcelable(null /* ClassLoader */, android.content.pm.ResolveInfo.class);