summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-09-24 11:36:57 -0700
committerDianne Hackborn <hackbod@google.com>2012-09-24 14:15:14 -0700
commit139748fd724b482e2c012a6ec44d1c5abc0c0e97 (patch)
treeaef4a2d661092f667e3c932e195c6bacd1208663 /api
parent4249be40bd1c51dae37c27f9450ed01f19edcbef (diff)
downloadframeworks_base-139748fd724b482e2c012a6ec44d1c5abc0c0e97.zip
frameworks_base-139748fd724b482e2c012a6ec44d1c5abc0c0e97.tar.gz
frameworks_base-139748fd724b482e2c012a6ec44d1c5abc0c0e97.tar.bz2
Fix issue #7215984: java.lang.RuntimeException: Unable to create...
...service com.android.systemui.SystemUIService: java.lang.NullPointerException - Don't acquire the activity manager lock in handleIncomingUser(), there is really no need to do so. - Rework the settings provider client side cache code to not hold locks while calling into the provider. I also changed the way the settings provider uses system properties so that there is one property for all users. We can't do one per user, since the system property name space is limited with a fixed size. And we don't really need to do that; the worse that happens by combining all users is that if one running user changes one of its settings, all other running users will think they need to reload settings when they go to fetch them next. Change-Id: I13b90b832310d117eb6d721aacd122cfba7d749a
Diffstat (limited to 'api')
-rw-r--r--api/current.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index a3b2434..4df0a7a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18789,7 +18789,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);
@@ -18845,7 +18845,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);
@@ -18928,7 +18928,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);