diff options
| author | Craig Mautner <cmautner@google.com> | 2012-10-23 17:01:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 17:01:20 -0700 |
| commit | a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c (patch) | |
| tree | abe77c741c3d4959b60427a00b5428c21e898c94 /core/java/android/app/Presentation.java | |
| parent | b68a3a47eff1f61322f3f65d1f9e89753676d8e7 (diff) | |
| parent | 9e96c69e3e9ebdb820acd347b4691c32a5d76be4 (diff) | |
| download | frameworks_base-a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c.zip frameworks_base-a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c.tar.gz frameworks_base-a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c.tar.bz2 | |
am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
* commit '9e96c69e3e9ebdb820acd347b4691c32a5d76be4':
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. * |