Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev

2013-09-05 20:38:55 +00:00
parent 0cdc24a2fb f691359724
commit dfafaffe86
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -710,7 +710,7 @@ class ContextImpl extends Context {
    @Override
    public SharedPreferences getSharedPreferences(String name, int mode) {
        SharedPreferencesImpl sp;
-        synchronized (mSync) {
+        synchronized (ContextImpl.class) {
            if (sSharedPrefs == null) {
                sSharedPrefs = new ArrayMap<String, ArrayMap<String, SharedPreferencesImpl>>();
            }