diff options
| author | Justin Ho <justinho@google.com> | 2012-10-17 15:53:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-17 15:53:02 -0700 |
| commit | 4db3165793a837ffc8197184fbc13ef2217e3dfc (patch) | |
| tree | ded63296318517ba0dcc904c523d1d9886c976e9 /api | |
| parent | 0f2d0147a938e32424cf69f7df5e0da2fba02355 (diff) | |
| parent | f49d835dfe1bd21920ff8a48cbdfb9c1fd632fd9 (diff) | |
| download | frameworks_base-4db3165793a837ffc8197184fbc13ef2217e3dfc.zip frameworks_base-4db3165793a837ffc8197184fbc13ef2217e3dfc.tar.gz frameworks_base-4db3165793a837ffc8197184fbc13ef2217e3dfc.tar.bz2 | |
Merge "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 d7f4e11..5462aee 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 deprecated int getLayoutDimension(int, java.lang.String); + method public 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 android.os.Looper getMainLooper(); + method public static synchronized android.os.Looper getMainLooper(); method public java.lang.Thread getThread(); method public static void loop(); method public static android.os.Looper myLooper(); |