summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ContextImpl.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-09-05 13:21:24 -0700
committerDianne Hackborn <hackbod@google.com>2013-09-05 13:21:24 -0700
commitf6913597247dfbfc0a1c387c976ec9004cb1cccb (patch)
treec8fc77eb11353bc5d5a93e1be6316c219725ea25 /core/java/android/app/ContextImpl.java
parent0851945a72e10e1d31aafa459f7e69cdf7087bee (diff)
downloadframeworks_base-f6913597247dfbfc0a1c387c976ec9004cb1cccb.zip
frameworks_base-f6913597247dfbfc0a1c387c976ec9004cb1cccb.tar.gz
frameworks_base-f6913597247dfbfc0a1c387c976ec9004cb1cccb.tar.bz2
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: Ib261a40619c43f7ea2e686057c0702fb5461d843
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
-rw-r--r--core/java/android/app/ContextImpl.java2
1 files changed, 1 insertions, 1 deletions
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 @@ 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>>();
}