Merge "Fix issue #5039287: Listen dies on back key on ICS but not on Gingerbread"

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(
+                            if (getApplicationInfo().targetSdkVersion
-                                    "trying to requery an already closed cursor  "
+                                    >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-                                    + mc.mCursor);
+                                throw new IllegalStateException(
+                                        "trying to requery an already closed cursor  "
+                                        + mc.mCursor);
+                            }
                         }
                         mc.mReleased = false;
                         mc.mUpdated = false;