summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@android.com> 2013-11-14 16:35:42 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-11-14 16:35:42 -0800
commit47b260d071859a8c20bb0af2bcc095e253f7046c (patch)
treeb415c415153dc9442974b1d0085ee5ce54a0a55b
parentec9e8933effe1dcb6887f7dca1cc0d78e6107e38 (diff)
parent572b759a41fd490fd21b5831dd8b8434b7fd5df8 (diff)
am 572b759a: Merge "Use index in SparseArray access properly"
* commit '572b759a41fd490fd21b5831dd8b8434b7fd5df8': Use index in SparseArray access properly
-rw-r--r--core/java/android/os/Bundle.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java
index b8769b4d50fb..ad54a141d795 100644
--- a/core/java/android/os/Bundle.java
+++ b/core/java/android/os/Bundle.java
@@ -353,7 +353,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;