diff options
| author | Mathias Agopian <mathias@google.com> | 2012-10-15 19:45:25 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-10-15 20:45:01 -0700 |
| commit | 6868d6f349610c15256471cc3d5fa708cbfd5f1d (patch) | |
| tree | e392c1de237063c353618ae31a4162239d237da0 /api | |
| parent | 809bb404da66498f1723279542d2a7d1f4512052 (diff) | |
| download | frameworks_base-6868d6f349610c15256471cc3d5fa708cbfd5f1d.zip frameworks_base-6868d6f349610c15256471cc3d5fa708cbfd5f1d.tar.gz frameworks_base-6868d6f349610c15256471cc3d5fa708cbfd5f1d.tar.bz2 | |
Revert "Revert "Fix for bug 6050753.""
Emergency revert -- fix reboot loop.
This reverts commit 8e63bcc63fd002231f8391af8982eeb235d096c8.
Change-Id: I4373b867d756de09cdf6aa0aba9e6ff8f47bcdbc
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 b5aa2c1..ee9a973 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 int getLayoutDimension(int, java.lang.String); + method public deprecated 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 synchronized android.os.Looper getMainLooper(); + method public static android.os.Looper getMainLooper(); method public java.lang.Thread getThread(); method public static void loop(); method public static android.os.Looper myLooper(); |