diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-09-01 14:38:24 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-09-01 14:38:24 -0700 |
| commit | a5445d3bbd7985ffeeeabc3813bec3d1e0463cea (patch) | |
| tree | 8f801ccfc53189747fd6ac4c557df74914404b4b /core/java/android/app | |
| parent | 1434ab98e690cbcfcdcd2296b491a44bff14cc55 (diff) | |
| download | frameworks_base-a5445d3bbd7985ffeeeabc3813bec3d1e0463cea.zip frameworks_base-a5445d3bbd7985ffeeeabc3813bec3d1e0463cea.tar.gz frameworks_base-a5445d3bbd7985ffeeeabc3813bec3d1e0463cea.tar.bz2 | |
Fix issue #5039287: Listen dies on back key on ICS but not on Gingerbread
Change-Id: I77c63a8c372ff7a8459a1e8cf6fd1b37f320e3ce
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; |