From ecd21848731f55978cdac739e6d4460a83449202 Mon Sep 17 00:00:00 2001
From: Taiju Tsuiki <tzik@google.com>
Date: Tue, 28 Apr 2015 13:36:15 +0900
Subject: [PATCH] Fix NPE in Bundle#hasFileDescriptor on null-valued
 SparseArray

Add a null check for each values of SparseArray in Bundle#hasFileDescriptor
to avoid NullPointerException.

Change-Id: I43ecc01f2759ccbe85b902fa118d55cb74ebf38b
---
 core/java/android/os/Bundle.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java
index 133debb65ec11..cb3e22be915bf 100644
--- a/core/java/android/os/Bundle.java
+++ b/core/java/android/os/Bundle.java
@@ -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;