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

Commit f89b28c4 authored by Mark Renouf's avatar Mark Renouf Committed by Automerger Merge Worker
Browse files

Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227



Change-Id: I62b7d51c4186e9e17da9539fadc6eeabc22a31e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5441f2c9 08a70e40

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

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

import com.android.internal.app.ResolverListAdapter.ResolveInfoPresentationGetter;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.List;





/**

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

        dest.writeCharSequence(mDisplayLabel);

        dest.writeCharSequence(mExtendedInfo);

        dest.writeCharSequence(mExtendedInfo);

        dest.writeParcelable(mResolvedIntent, 0);

        dest.writeParcelable(mResolvedIntent, 0);

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

        dest.writeTypedList(mSourceIntents);

        dest.writeBoolean(mIsSuspended);

        dest.writeBoolean(mIsSuspended);

        dest.writeBoolean(mPinned);

        dest.writeBoolean(mPinned);

        dest.writeParcelable(mResolveInfo, 0);

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

        mDisplayLabel = in.readCharSequence();

        mExtendedInfo = in.readCharSequence();

        mExtendedInfo = in.readCharSequence();

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

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

        mSourceIntents.addAll(

        in.readTypedList(mSourceIntents, Intent.CREATOR);

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

                        Intent.class)));

        mIsSuspended = in.readBoolean();

        mIsSuspended = in.readBoolean();

        mPinned = in.readBoolean();

        mPinned = in.readBoolean();

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

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