diff options
Diffstat (limited to 'chromium')
-rw-r--r-- | chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java index 9f9c3aa..840d306 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java @@ -27,7 +27,6 @@ import android.content.Intent; 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; @@ -144,7 +143,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { 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(); @@ -152,6 +151,20 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { // 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()); |