summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-10-16 19:01:32 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-16 19:01:32 -0700
commitdcf59629beed8182759a1068ab8ee997935bef82 (patch)
tree732179c3ca4004019fca094e81bd42a234f1cafb /api
parent6868d6f349610c15256471cc3d5fa708cbfd5f1d (diff)
downloadframeworks_base-dcf59629beed8182759a1068ab8ee997935bef82.zip
frameworks_base-dcf59629beed8182759a1068ab8ee997935bef82.tar.gz
frameworks_base-dcf59629beed8182759a1068ab8ee997935bef82.tar.bz2
This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
Revert "Revert "Revert "Fix for bug 6050753.""" This reverts commit 6868d6f349610c15256471cc3d5fa708cbfd5f1d Change-Id: I8843d92dba14c82f06d9ee59517cf11b2abbbf04
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 ee9a973..b5aa2c1 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();
@@ -16149,7 +16149,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();