diff options
| author | Justin Ho <justinho@google.com> | 2012-10-17 16:03:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 16:03:29 -0700 |
| commit | 5c555f39fb9bb1a47c081ae62658454e92792f44 (patch) | |
| tree | 92e2dd8ecf315560389cd0d6b6a063f4a748a0f1 /api | |
| parent | 76b98648608cd72f8609b1924193f3fc68f5d4da (diff) | |
| parent | 0efebf0af4c21b9d02c9c06b67867a554e0b35ea (diff) | |
| download | frameworks_base-5c555f39fb9bb1a47c081ae62658454e92792f44.zip frameworks_base-5c555f39fb9bb1a47c081ae62658454e92792f44.tar.gz frameworks_base-5c555f39fb9bb1a47c081ae62658454e92792f44.tar.bz2 | |
am 0efebf0a: am c35f7650: am 4db31657: 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
* commit '0efebf0af4c21b9d02c9c06b67867a554e0b35ea':
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')
| -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 a897fd7..e1aa9ef 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(); |