diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:24:39 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:25:15 -0700 |
| commit | 6fb2514cdf77e2657d7b73b0cd97e060aefc6b53 (patch) | |
| tree | 1f914b2dc2bb371a2b41388a0c0fe056e4f439ee /api | |
| parent | 8f862ef9f74f2d2ebf767c645ce39db8412dd08f (diff) | |
| parent | 139748fd724b482e2c012a6ec44d1c5abc0c0e97 (diff) | |
| download | frameworks_base-6fb2514cdf77e2657d7b73b0cd97e060aefc6b53.zip frameworks_base-6fb2514cdf77e2657d7b73b0cd97e060aefc6b53.tar.gz frameworks_base-6fb2514cdf77e2657d7b73b0cd97e060aefc6b53.tar.bz2 | |
Merge into jb-mr1-dev
Change-Id: I1baab28b12364213673ed7992207ad198491f286
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 8fd5b3e..fe80629 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18797,7 +18797,7 @@ package android.provider { method public static int getInt(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException; method public static long getLong(android.content.ContentResolver, java.lang.String, long); method public static long getLong(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException; - method public static synchronized java.lang.String getString(android.content.ContentResolver, java.lang.String); + method public static java.lang.String getString(android.content.ContentResolver, java.lang.String); method public static android.net.Uri getUriFor(java.lang.String); method public static boolean putFloat(android.content.ContentResolver, java.lang.String, float); method public static boolean putInt(android.content.ContentResolver, java.lang.String, int); @@ -18853,7 +18853,7 @@ package android.provider { method public static int getInt(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException; method public static long getLong(android.content.ContentResolver, java.lang.String, long); method public static long getLong(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException; - method public static synchronized java.lang.String getString(android.content.ContentResolver, java.lang.String); + method public static java.lang.String getString(android.content.ContentResolver, java.lang.String); method public static android.net.Uri getUriFor(java.lang.String); method public static final boolean isLocationProviderEnabled(android.content.ContentResolver, java.lang.String); method public static boolean putFloat(android.content.ContentResolver, java.lang.String, float); @@ -18936,7 +18936,7 @@ package android.provider { method public static long getLong(android.content.ContentResolver, java.lang.String, long); method public static long getLong(android.content.ContentResolver, java.lang.String) throws android.provider.Settings.SettingNotFoundException; method public static deprecated boolean getShowGTalkServiceStatus(android.content.ContentResolver); - method public static synchronized java.lang.String getString(android.content.ContentResolver, java.lang.String); + method public static java.lang.String getString(android.content.ContentResolver, java.lang.String); method public static android.net.Uri getUriFor(java.lang.String); method public static boolean putConfiguration(android.content.ContentResolver, android.content.res.Configuration); method public static boolean putFloat(android.content.ContentResolver, java.lang.String, float); |