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 /api/current.txt | |
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 'api/current.txt')
-rw-r--r-- | api/current.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 5462aee..31ed755 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16151,7 +16151,7 @@ package android.os { public class Looper { method public void dump(android.util.Printer, java.lang.String); - method public static synchronized android.os.Looper getMainLooper(); + method public static android.os.Looper getMainLooper(); method public java.lang.Thread getThread(); method public static void loop(); method public static android.os.Looper myLooper(); @@ -25977,6 +25977,11 @@ package android.view { ctor public WindowManager.BadTokenException(java.lang.String); } + public static class WindowManager.InvalidDisplayException extends java.lang.RuntimeException { + ctor public WindowManager.InvalidDisplayException(); + ctor public WindowManager.InvalidDisplayException(java.lang.String); + } + public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable { ctor public WindowManager.LayoutParams(); ctor public WindowManager.LayoutParams(int); |