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

Commit b40b4957 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 7ecc6b72: am 71fa6862: Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray" 

* commit '7ecc6b72':
  Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray
parents 498bf16e 7ecc6b72

core/java/android/os/Bundle.java

+2 −1
Original line number Diff line number Diff line
@@ -222,7 +222,8 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { 
                        SparseArray<? extends Parcelable> array =

                                (SparseArray<? extends Parcelable>) obj;

                        for (int n = array.size() - 1; n >= 0; n--) {

                            if ((array.valueAt(n).describeContents()

                            Parcelable p = array.valueAt(n);

                            if (p != null && (p.describeContents()

                                    & Parcelable.CONTENTS_FILE_DESCRIPTOR) != 0) {

                                fdFound = true;

                                break;