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

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

Browse Source 
* commit 'b736868be917afd5d3ea7e8a8d3d658c4350a239':
  Fix NullPointerException in Bundle#hasFileDescriptors
This commit is contained in:
Narayan Kamath
2015-04-28 09:48:19 +00:00
committed by Android Git Automerger
parent 8ab766ebb6 b736868be9
commit 90601a724e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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