diff options
author | Craig Mautner <cmautner@google.com> | 2012-10-23 16:57:11 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 16:57:11 -0700 |
commit | 9e96c69e3e9ebdb820acd347b4691c32a5d76be4 (patch) | |
tree | f739762d427ea6824eae82876ddc7231f7b78a52 /core/java/android/app/Presentation.java | |
parent | 4fed68a2b1c7d35f421d8eee672138e55b769d86 (diff) | |
parent | 6757572b39d3802c4d7b69467b5ebf69a96c208b (diff) | |
download | frameworks_base-9e96c69e3e9ebdb820acd347b4691c32a5d76be4.zip frameworks_base-9e96c69e3e9ebdb820acd347b4691c32a5d76be4.tar.gz frameworks_base-9e96c69e3e9ebdb820acd347b4691c32a5d76be4.tar.bz2 |
am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
* commit '6757572b39d3802c4d7b69467b5ebf69a96c208b':
Add throwing InvalidDisplayException from addView.
Diffstat (limited to 'core/java/android/app/Presentation.java')
-rw-r--r-- | core/java/android/app/Presentation.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/app/Presentation.java b/core/java/android/app/Presentation.java index b5e5244..20b27c5 100644 --- a/core/java/android/app/Presentation.java +++ b/core/java/android/app/Presentation.java @@ -141,6 +141,16 @@ public class Presentation extends Dialog { } /** + * Inherited from {@link Dialog#show}. Will throw + * {@link android.view.WindowManager.InvalidDisplayException} if the specified secondary + * {@link Display} can't be found. + */ + @Override + public void show() { + super.show(); + } + + /** * Called by the system when the {@link Display} to which the presentation * is attached has been removed. * |