Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix when managed cursors are required.

Browse Source 
Only do this when we are actually restarting, not when we
are just resuming after a pause.

Change-Id: I32fd263917b03776efca8e096d0343107721398d
This commit is contained in:
Dianne Hackborn
2011-06-03 15:26:01 -07:00
parent b4b44bd329
commit 185e3e243e
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/java/android/app/Activity.java
View File

@@ -4421,27 +4421,29 @@ public class Activity extends ContextThemeWrapper
final void performRestart() {
mFragments.noteStateNotSaved();
synchronized (mManagedCursors) {
final int N = mManagedCursors.size();
for (int i=0; i<N; i++) {
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.mReleased = false;
mc.mUpdated = false;
}
}
}
if (mStopped) {
mStopped = false;
mCalled = false;
if (mToken != null && mParent == null) {
WindowManagerImpl.getDefault().setStoppedState(mToken, false);
}
synchronized (mManagedCursors) {
final int N = mManagedCursors.size();
for (int i=0; i<N; i++) {
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);
}
mc.mReleased = false;
mc.mUpdated = false;
}
}
}
mCalled = false;
mInstrumentation.callActivityOnRestart(this);
if (!mCalled) {
throw new SuperNotCalledException(