commit 5112943866a77868d1987617ed1320e73e2a9ce4
author Ignacio Solla <igsolla@google.com> Tue Oct 28 13:10:41 2014 +0000
committer Ignacio Solla Paula <igsolla@google.com> Wed Oct 29 10:58:26 2014 +0000
tree 1f01c8074741430720c51aa6f6f14ad358e03efd
parent 248d0477b27ef31220ecd9a736bab75fd8f5e9b2

[WebView] Remove dependency on FileUtils.

We implement our own version of deleteContents to
avoid depending on FileUtils, a hidden Android API.

BUG:18152150

Change-Id: I8607e36827bacc38a80a35f65c13f39f561551a0

chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 31708d1..cbeead5 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -26,7 +26,6 @@
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
-import android.os.FileUtils;
 import android.os.Looper;
 import android.os.StrictMode;
 import android.os.SystemProperties;
@@ -135,7 +134,7 @@
             String dataDir = PathUtils.getDataDirectory(ActivityThread.currentApplication());
             Log.i(TAG, "WebView package downgraded from " + lastVersion + " to " + currentVersion +
                        "; deleting contents of " + dataDir);
-            FileUtils.deleteContents(new File(dataDir));
+            deleteContents(new File(dataDir));
         }
         if (lastVersion != currentVersion) {
             mWebViewPrefs.edit().putInt(VERSION_CODE_PREF, currentVersion).apply();
@@ -143,6 +142,20 @@
         // Now safe to use WebView data directory.
     }
 
+    private static void deleteContents(File dir) {
+        File[] files = dir.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.isDirectory()) {
+                    deleteContents(file);
+                }
+                if (!file.delete()) {
+                    Log.w(TAG, "Failed to delete " + file);
+                }
+            }
+        }
+    }
+
     private void initPlatSupportLibrary() {
         DrawGLFunctor.setChromiumAwDrawGLFunction(AwContents.getAwDrawGLFunction());
         AwContents.setAwDrawSWFunctionTable(GraphicsUtils.getDrawSWFunctionTable());