commit eb5b70b85cb6c8dfe15368e478407a92c1b301f2
author Dianne Hackborn <hackbod@google.com> Thu Sep 05 13:21:24 2013 -0700
committer Dianne Hackborn <hackbod@google.com> Thu Sep 05 15:20:17 2013 -0700
tree c8fc77eb11353bc5d5a93e1be6316c219725ea25
parent 0851945a72e10e1d31aafa459f7e69cdf7087bee

Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put

Locking of sSharedPrefs was bad -- it was using a per-context lock
instead of a static lock.

Change-Id: Ib7a929f9fd93f22cc817d32b53ac56523cdad75f

core/java/android/app/ContextImpl.java

diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 5c49dd2..e776a98 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -710,7 +710,7 @@
     @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>>();
             }