Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80

b:6208468

Both getDataManager and getImageCacheService use the same lock but the latter method is blocked on
RandomAccessFile's open syscall. The lock should be separated because they're independent and
getDataManager is very frequently used too.

Change-Id: I4d44cfc949f45a31c7200c8327115bc4b7fde60f

1 files changed, 8 insertions, 4 deletions

diff --git a/src/com/android/gallery3d/app/GalleryAppImpl.java b/src/com/android/gallery3d/app/GalleryAppImpl.java
index ac551dd95..852926bc7 100644
--- a/src/com/android/gallery3d/app/GalleryAppImpl.java
+++ b/src/com/android/gallery3d/app/GalleryAppImpl.java
@@ -35,6 +35,7 @@ public class GalleryAppImpl extends Application implements GalleryApp {
     private static final long DOWNLOAD_CAPACITY = 64 * 1024 * 1024; // 64M
 
     private ImageCacheService mImageCacheService;
+    private Object mLock = new Object();
     private DataManager mDataManager;
     private ThreadPool mThreadPool;
     private DownloadCache mDownloadCache;
@@ -60,11 +61,14 @@ public class GalleryAppImpl extends Application implements GalleryApp {
         return mDataManager;
     }
 
-    public synchronized ImageCacheService getImageCacheService() {
-        if (mImageCacheService == null) {
-            mImageCacheService = new ImageCacheService(getAndroidContext());
+    public ImageCacheService getImageCacheService() {
+        // This method may block on file I/O so a dedicated lock is needed here.
+        synchronized (mLock) {
+            if (mImageCacheService == null) {
+                mImageCacheService = new ImageCacheService(getAndroidContext());
+            }
+            return mImageCacheService;
         }
-        return mImageCacheService;
     }
 
     public synchronized ThreadPool getThreadPool() {