Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb am: f89b28c4c6 am: e5990a182e

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

Change-Id: I351ca879cb1c53a1b357b667e5f554d3eb646b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mark Renouf
2022-06-04 13:09:58 +00:00
committed by Automerger Merge Worker
parent a079439f68 e5990a182e
commit 5ae61e909c
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/app/chooser/DisplayResolveInfo.java
View File

@@ -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);