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

* commit 'dfafaffe8601a3483e8da8f32bd4c754fecb88c1': Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put
2013-09-05 13:40:42 -07:00
parent 4063e9e732 dfafaffe86
commit 8e535cec2e
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>>();
            }