summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2012-10-15 13:24:58 -0700
committerRomain Guy <romainguy@google.com>2012-10-15 13:24:58 -0700
commit8e63bcc63fd002231f8391af8982eeb235d096c8 (patch)
tree75b2a0fceb1b7a366665b78bee09ac01786ee06e /api
parenta30d969401a8533a5a341664421ba9b1e150bac3 (diff)
downloadframeworks_base-8e63bcc63fd002231f8391af8982eeb235d096c8.zip
frameworks_base-8e63bcc63fd002231f8391af8982eeb235d096c8.tar.gz
frameworks_base-8e63bcc63fd002231f8391af8982eeb235d096c8.tar.bz2
Revert "Fix for bug 6050753."
This reverts commit c29f031598811486d83f418fd08fbfe1fc41788a.
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();