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

Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"

Browse Source
This commit is contained in:
Narayan Kamath
2015-04-28 08:32:55 +00:00
committed by Gerrit Code Review
parent b736868be9 ecd2184873
commit 71fa6862f3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/Bundle.java
View File

@@ -222,7 +222,8 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable {
SparseArray<? extends Parcelable> array = SparseArray<? extends Parcelable> array =
(SparseArray<? extends Parcelable>) obj; (SparseArray<? extends Parcelable>) obj;
for (int n = array.size() - 1; n >= 0; n--) { 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) { & Parcelable.CONTENTS_FILE_DESCRIPTOR) != 0) {
fdFound = true; fdFound = true;
break; break;