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

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

am b736868b: Merge "Fix NullPointerException in Bundle#hasFileDescriptors" 

* commit 'b736868b':
  Fix NullPointerException in Bundle#hasFileDescriptors
parents 8ab766eb b736868b

core/java/android/os/Bundle.java

+3 −2
Original line number Diff line number Diff line
@@ -211,8 +211,9 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { 
                    } else if (obj instanceof Parcelable[]) {

                        Parcelable[] array = (Parcelable[]) obj;

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

                            if ((array[n].describeContents()

                                    & Parcelable.CONTENTS_FILE_DESCRIPTOR) != 0) {

                            Parcelable p = array[n];

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

                                    & Parcelable.CONTENTS_FILE_DESCRIPTOR) != 0)) {

                                fdFound = true;

                                break;

                            }