summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDave Burke <daveburke@google.com>2012-10-18 20:41:55 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-18 20:41:55 -0700
commit579e14016c4a972e70cd2bd0c6d89bbd7e9e941c (patch)
tree732179c3ca4004019fca094e81bd42a234f1cafb /api
parent57fca90ac65ecfe97acd4c93d442c3db8f815e11 (diff)
downloadframeworks_base-579e14016c4a972e70cd2bd0c6d89bbd7e9e941c.zip
frameworks_base-579e14016c4a972e70cd2bd0c6d89bbd7e9e941c.tar.gz
frameworks_base-579e14016c4a972e70cd2bd0c6d89bbd7e9e941c.tar.bz2
Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11 Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
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();