summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-10-16 19:22:36 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-16 19:22:37 -0700
commit8e6145013a6533ca6a33e03c8a5e45ad2de431e4 (patch)
tree7ba960b673de7f459b312d9435ad17bebe99d225 /api
parent1b85122bd22c4528679ae8bd67077dfc2fdf1847 (diff)
parentdcf59629beed8182759a1068ab8ee997935bef82 (diff)
downloadframeworks_base-8e6145013a6533ca6a33e03c8a5e45ad2de431e4.zip
frameworks_base-8e6145013a6533ca6a33e03c8a5e45ad2de431e4.tar.gz
frameworks_base-8e6145013a6533ca6a33e03c8a5e45ad2de431e4.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.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index c45706e..3705140 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();