diff options
| author | Justin Ho <justinho@google.com> | 2012-10-17 10:50:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-17 10:50:39 -0700 |
| commit | 144d405511e9ed685568e50db87b22cc42b6a252 (patch) | |
| tree | 5bac217b0a607322aa7535d919a65a5ed470acd9 /api | |
| parent | dec9e1640a7ae0b20f7fe79fa9c8cecacc4e07a9 (diff) | |
| parent | 57fca90ac65ecfe97acd4c93d442c3db8f815e11 (diff) | |
| download | frameworks_base-144d405511e9ed685568e50db87b22cc42b6a252.zip frameworks_base-144d405511e9ed685568e50db87b22cc42b6a252.tar.gz frameworks_base-144d405511e9ed685568e50db87b22cc42b6a252.tar.bz2 | |
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
Diffstat (limited to 'api')
| -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 3705140..c45706e 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(); |