diff options
| author | Justin Ho <justinho@google.com> | 2012-10-17 16:03:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 16:03:11 -0700 |
| commit | 22bd3726be37a24e956d962d61657d8a3d54c985 (patch) | |
| tree | cd9c0a8b295e38a6f915c8340cb38c53cfa0ec45 /api/current.txt | |
| parent | 0efebf0af4c21b9d02c9c06b67867a554e0b35ea (diff) | |
| parent | 76a0142477e3ebda381d717572b21b355c172c26 (diff) | |
| download | frameworks_base-22bd3726be37a24e956d962d61657d8a3d54c985.zip frameworks_base-22bd3726be37a24e956d962d61657d8a3d54c985.tar.gz frameworks_base-22bd3726be37a24e956d962d61657d8a3d54c985.tar.bz2 | |
am 76a01424: am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev
* commit '76a0142477e3ebda381d717572b21b355c172c26':
Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 5462aee..d7f4e11 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7094,7 +7094,7 @@ package android.content.res { method public int getIndexCount(); method public int getInt(int, int); method public int getInteger(int, int); - method public int getLayoutDimension(int, java.lang.String); + method public deprecated int getLayoutDimension(int, java.lang.String); method public int getLayoutDimension(int, int); method public java.lang.String getNonResourceString(int); method public java.lang.String getPositionDescription(); @@ -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(); |