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

am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread

Browse Source 
Merge commit '9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp

* commit '9d6824cd53960b4562ea3c55876b40ca21710050':
  Make Activity.removeDialog() less strict.
This commit is contained in:
Dianne Hackborn
2010-10-07 07:16:34 -07:00
committed by Android Git Automerger
parent 6ed0cfd3e7 9d6824cd53
commit 55f1b0b82f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2609,6 +2609,10 @@ public class Activity extends ContextThemeWrapper
* <p>This can be useful if you know that you will never show a dialog again and
* want to avoid the overhead of saving and restoring it in the future.
*
* <p>As of {@link android.os.Build.VERSION_CODES#GINGERBREAD}, this function
* will not throw an exception if you try to remove an ID that does not
* currently have an associated dialog.</p>
*
* @param id The id of the managed dialog.
*
* @see #onCreateDialog(int, Bundle)
@@ -2617,17 +2621,13 @@ public class Activity extends ContextThemeWrapper
* @see #dismissDialog(int)
*/
public final void removeDialog(int id) {
if (mManagedDialogs == null) {
return;
if (mManagedDialogs != null) {
final ManagedDialog md = mManagedDialogs.get(id);
if (md != null) {
md.mDialog.dismiss();
mManagedDialogs.remove(id);
}
}
final ManagedDialog md = mManagedDialogs.get(id);
if (md == null) {
return;
}
md.mDialog.dismiss();
mManagedDialogs.remove(id);
}
/**