Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2145)

Unified Diff: base/android/java/src/org/chromium/base/library_loader/LibraryLoaderHelper.java

Issue 217283005: [Android] Fix a few issues related to old lib deletion. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: take cjhopman's comments Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/android/java/src/org/chromium/base/library_loader/LibraryLoaderHelper.java
diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoaderHelper.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoaderHelper.java
index 7eeb2c8c3421774464ad1694fd80196eadec2d29..0751beb44123f6fa97ec776b9e3f2bc9ef485521 100644
--- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoaderHelper.java
+++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoaderHelper.java
@@ -133,10 +133,7 @@ public class LibraryLoaderHelper {
sLibrariesWereUnpacked = true;
File libDir = getWorkaroundLibDir(context);
- if (libDir.exists()) {
- assert libDir.isDirectory();
- deleteDirectorySync(libDir);
- }
+ deleteDirectorySync(libDir);
try {
ApplicationInfo appInfo = context.getApplicationInfo();
@@ -210,19 +207,14 @@ public class LibraryLoaderHelper {
*
* @param context
*/
- static void deleteWorkaroundLibrariesAsynchronously(Context context) {
+ static void deleteWorkaroundLibrariesAsynchronously(final Context context) {
// Child process should not reach here.
- final File libDir = getWorkaroundLibDir(context);
- if (libDir.exists()) {
- assert libDir.isDirectory();
- // Async deletion
- new Thread() {
- @Override
- public void run() {
- deleteDirectorySync(libDir);
- }
- }.start();
- }
+ new Thread() {
+ @Override
+ public void run() {
+ deleteWorkaroundLibrariesSynchronously(context);
+ }
+ }.start();
}
/**
@@ -232,9 +224,7 @@ public class LibraryLoaderHelper {
*/
public static void deleteWorkaroundLibrariesSynchronously(Context context) {
File libDir = getWorkaroundLibDir(context);
- if (libDir.exists()) {
- deleteDirectorySync(libDir);
- }
+ deleteDirectorySync(libDir);
}
private static void deleteDirectorySync(File dir) {

Powered by Google App Engine
This is Rietveld 408576698