diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-09-01 15:55:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-01 15:55:33 -0700 |
| commit | 554d4a576586d0e21312862c4b1cf9abdaaf15f4 (patch) | |
| tree | cfe7da773cc333c002c6526a1e53bdc11d71eb61 /core/java/android/app | |
| parent | 69666e078152362b19d02d9ee79bbd5fc69e09c3 (diff) | |
| parent | a5445d3bbd7985ffeeeabc3813bec3d1e0463cea (diff) | |
| download | frameworks_base-554d4a576586d0e21312862c4b1cf9abdaaf15f4.zip frameworks_base-554d4a576586d0e21312862c4b1cf9abdaaf15f4.tar.gz frameworks_base-554d4a576586d0e21312862c4b1cf9abdaaf15f4.tar.bz2 | |
Merge "Fix issue #5039287: Listen dies on back key on ICS but not on Gingerbread"
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/Activity.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 0e3eaaa..41e3fdf 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4471,9 +4471,12 @@ public class Activity extends ContextThemeWrapper ManagedCursor mc = mManagedCursors.get(i); if (mc.mReleased || mc.mUpdated) { if (!mc.mCursor.requery()) { - throw new IllegalStateException( - "trying to requery an already closed cursor " - + mc.mCursor); + if (getApplicationInfo().targetSdkVersion + >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) { + throw new IllegalStateException( + "trying to requery an already closed cursor " + + mc.mCursor); + } } mc.mReleased = false; mc.mUpdated = false; |