1 files changed, 9 insertions, 2 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java
index 0c615018558a..2b2d1f40060b 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java
@@ -28,13 +28,14 @@ import android.net.Uri;
 import android.os.RemoteException;
 import android.text.format.DateUtils;
 
+import java.io.File;
+
 public class DocumentsApplication extends Application {
     private static final long PROVIDER_ANR_TIMEOUT = 20 * DateUtils.SECOND_IN_MILLIS;
 
     private RootsCache mRoots;
 
     private ThumbnailCache mThumbnailCache;
-
     private DocumentClipper mClipper;
 
     public static RootsCache getRootsCache(Context context) {
@@ -73,7 +74,7 @@ public class DocumentsApplication extends Application {
 
         mThumbnailCache = new ThumbnailCache(memoryClassBytes / 4);
 
-        mClipper = new DocumentClipper(this);
+        mClipper = createClipper(this.getApplicationContext());
 
         final IntentFilter packageFilter = new IntentFilter();
         packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
@@ -88,6 +89,12 @@ public class DocumentsApplication extends Application {
         registerReceiver(mCacheReceiver, localeFilter);
     }
 
+    private static DocumentClipper createClipper(Context context) {
+        // prepare storage handles initialization and cleanup of the clip directory.
+        File clipDir = ClipStorage.prepareStorage(context.getCacheDir());
+        return new DocumentClipper(context, new ClipStorage(clipDir));
+    }
+
     @Override
     public void onTrimMemory(int level) {
         super.onTrimMemory(level);