diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-09-05 20:38:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-05 20:38:55 +0000 |
| commit | dfafaffe8601a3483e8da8f32bd4c754fecb88c1 (patch) | |
| tree | 3cf75620242bc3567b3326774c544b8df85a8bc8 | |
| parent | 0cdc24a2fb5268241cf16c6b28a4a3b58965a2c8 (diff) | |
| parent | f6913597247dfbfc0a1c387c976ec9004cb1cccb (diff) | |
| download | frameworks_base-dfafaffe8601a3483e8da8f32bd4c754fecb88c1.zip frameworks_base-dfafaffe8601a3483e8da8f32bd4c754fecb88c1.tar.gz frameworks_base-dfafaffe8601a3483e8da8f32bd4c754fecb88c1.tar.bz2 | |
Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 2 |
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>>(); } |