commit 22103395dc2169b024982772ab0d6196a5ffcf2b
author jinwu <jinwu@codeaurora.org> Mon Apr 27 15:14:48 2020 +0800
committer jinwu <jinwu@codeaurora.org> Mon Apr 27 15:17:42 2020 +0800
tree 453f47874d5b06c79d086fc55a60ee8e513b0fa8
parent 933abdff02666cca705b893c9e89bcab3792c31e

Fix get null from getExternalCacheDir

Gallery can't work when this API getExternalCacheDir return null.
Use getCacheDir instead of getExternalCacheDir to avoid it.

Change-Id: I7d2731c5881be0b8f95760f16159afbe583a0dea

src/com/android/gallery3d/app/AbstractGalleryActivity.java

diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
index 824f6b9..4c085f2 100755
--- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java
+++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
@@ -67,7 +67,7 @@
     private BroadcastReceiver mMountReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (getExternalCacheDir() != null) onStorageReady();
+            if (getCacheDir() != null) onStorageReady();
         }
     };
     private IntentFilter mMountFilter = new IntentFilter(Intent.ACTION_MEDIA_MOUNTED);
@@ -156,7 +156,7 @@
     @Override
     protected void onStart() {
         super.onStart();
-        if (getExternalCacheDir() == null) {
+        if (getCacheDir() == null) {
             OnCancelListener onCancel = new OnCancelListener() {
                 @Override
                 public void onCancel(DialogInterface dialog) {

src/com/android/gallery3d/app/GalleryAppImpl.java

diff --git a/src/com/android/gallery3d/app/GalleryAppImpl.java b/src/com/android/gallery3d/app/GalleryAppImpl.java
index 9c5f232..e1f6198 100644
--- a/src/com/android/gallery3d/app/GalleryAppImpl.java
+++ b/src/com/android/gallery3d/app/GalleryAppImpl.java
@@ -96,7 +96,7 @@
     @Override
     public synchronized DownloadCache getDownloadCache() {
         if (mDownloadCache == null) {
-            File cacheDir = new File(getExternalCacheDir(), DOWNLOAD_FOLDER);
+            File cacheDir = new File(getCacheDir(), DOWNLOAD_FOLDER);
 
             if (!cacheDir.isDirectory()) cacheDir.mkdirs();
 

src/com/android/gallery3d/ui/CacheStorageUsageInfo.java

diff --git a/src/com/android/gallery3d/ui/CacheStorageUsageInfo.java b/src/com/android/gallery3d/ui/CacheStorageUsageInfo.java
index 46f7a24..be806e2 100644
--- a/src/com/android/gallery3d/ui/CacheStorageUsageInfo.java
+++ b/src/com/android/gallery3d/ui/CacheStorageUsageInfo.java
@@ -54,7 +54,7 @@
     }
 
     public void loadStorageInfo(JobContext jc) {
-        File cacheDir = mContext.getExternalCacheDir();
+        File cacheDir = mContext.getCacheDir();
         if (cacheDir == null) {
             cacheDir = mContext.getCacheDir();
         }

src/com/android/gallery3d/util/CacheManager.java

diff --git a/src/com/android/gallery3d/util/CacheManager.java b/src/com/android/gallery3d/util/CacheManager.java
index ba466f7..0d76ce1 100644
--- a/src/com/android/gallery3d/util/CacheManager.java
+++ b/src/com/android/gallery3d/util/CacheManager.java
@@ -45,7 +45,7 @@
             }
             BlobCache cache = sCacheMap.get(filename);
             if (cache == null) {
-                File cacheDir = context.getExternalCacheDir();
+                File cacheDir = context.getCacheDir();
                 String path = cacheDir.getAbsolutePath() + "/" + filename;
                 try {
                     cache = new BlobCache(path, maxEntries, maxBytes, false,
@@ -72,7 +72,7 @@
         if (n != 0) return;
         pref.edit().putInt(KEY_CACHE_UP_TO_DATE, 1).commit();
 
-        File cacheDir = context.getExternalCacheDir();
+        File cacheDir = context.getCacheDir();
         String prefix = cacheDir.getAbsolutePath() + "/";
 
         BlobCache.deleteFiles(prefix + "imgcache");