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

Merge change 4808 into donut

Browse Source 
* changes:
  Fixes #1928566. Prevents runtime restart upon configuration change.
This commit is contained in:
Android (Google) Code Review
2009-06-19 13:31:14 -07:00
parent 066e6bfd01 e35c235145
commit 4d1b5bd148
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -864,7 +864,9 @@ public class Activity extends ContextThemeWrapper
final Integer dialogId = ids[i]; final Integer dialogId = ids[i];
Bundle dialogState = b.getBundle(savedDialogKeyFor(dialogId)); Bundle dialogState = b.getBundle(savedDialogKeyFor(dialogId));
if (dialogState != null) { if (dialogState != null) {
final Dialog dialog = createDialog(dialogId); // Calling onRestoreInstanceState() below will invoke dispatchOnCreate
// so tell createDialog() not to do it, otherwise we get an exception
final Dialog dialog = createDialog(dialogId, false);
mManagedDialogs.put(dialogId, dialog); mManagedDialogs.put(dialogId, dialog);
onPrepareDialog(dialogId, dialog); onPrepareDialog(dialogId, dialog);
dialog.onRestoreInstanceState(dialogState); dialog.onRestoreInstanceState(dialogState);
@@ -872,13 +874,13 @@ public class Activity extends ContextThemeWrapper
} }
} }
private Dialog createDialog(Integer dialogId) { private Dialog createDialog(Integer dialogId, boolean dispatchOnCreate) {
final Dialog dialog = onCreateDialog(dialogId); final Dialog dialog = onCreateDialog(dialogId);
if (dialog == null) { if (dialog == null) {
throw new IllegalArgumentException("Activity#onCreateDialog did " throw new IllegalArgumentException("Activity#onCreateDialog did "
+ "not create a dialog for id " + dialogId); + "not create a dialog for id " + dialogId);
} }
dialog.dispatchOnCreate(null); if (dispatchOnCreate) dialog.dispatchOnCreate(null);
return dialog; return dialog;
} }
@@ -2430,7 +2432,7 @@ public class Activity extends ContextThemeWrapper
} }
Dialog dialog = mManagedDialogs.get(id); Dialog dialog = mManagedDialogs.get(id);
if (dialog == null) { if (dialog == null) {
dialog = createDialog(id); dialog = createDialog(id, true);
mManagedDialogs.put(id, dialog); mManagedDialogs.put(id, dialog);
} }