diff options
| author | Dianne Hackborn <hackbod@android.com> | 2013-11-14 16:37:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-14 16:37:55 -0800 |
| commit | 6f5d85377be86f6d2856470788471bdda5832366 (patch) | |
| tree | 34065e525f2270720e52720d0a9589307274c6ba /core/java | |
| parent | dab5ba58fe51c4e800c704a698cd3b9a4e47c7c1 (diff) | |
| parent | 47b260d071859a8c20bb0af2bcc095e253f7046c (diff) | |
| download | frameworks_base-6f5d85377be86f6d2856470788471bdda5832366.zip frameworks_base-6f5d85377be86f6d2856470788471bdda5832366.tar.gz frameworks_base-6f5d85377be86f6d2856470788471bdda5832366.tar.bz2 | |
am 47b260d0: am 572b759a: Merge "Use index in SparseArray access properly"
* commit '47b260d071859a8c20bb0af2bcc095e253f7046c':
Use index in SparseArray access properly
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/Bundle.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index f9c1d31..af57507 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -380,7 +380,7 @@ public final class Bundle implements Parcelable, Cloneable { SparseArray<? extends Parcelable> array = (SparseArray<? extends Parcelable>) obj; for (int n = array.size() - 1; n >= 0; n--) { - if ((array.get(n).describeContents() + if ((array.valueAt(n).describeContents() & Parcelable.CONTENTS_FILE_DESCRIPTOR) != 0) { fdFound = true; break; |