resolve merge conflicts of e5ef3d2e9b to ub-launcher3-master.

Change-Id: I37cbbe4f51cc0a8de8071434020ec1553241da85

1 files changed, 2 insertions, 14 deletions

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 261292d69..494ea2fe1 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -43,7 +43,6 @@ import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Process;
-import android.os.StrictMode;
 import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -57,7 +56,6 @@ import com.android.launcher3.config.ProviderConfig;
 import com.android.launcher3.util.ManagedProfileHeuristic;
 import com.android.launcher3.util.Thunk;
 
-import java.io.File;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -322,7 +320,8 @@ public class LauncherProvider extends ContentProvider {
                 return null;
             }
             case LauncherSettings.Settings.METHOD_DELETE_DB: {
-                deleteDatabase();
+                // Are you sure? (y/n)
+                mOpenHelper.createEmptyDB(mOpenHelper.getWritableDatabase());
                 return null;
             }
         }
@@ -482,17 +481,6 @@ public class LauncherProvider extends ContentProvider {
                 mOpenHelper, getContext().getResources(), defaultLayout);
     }
 
-    private void deleteDatabase() {
-        // Are you sure? (y/n)
-        final SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-        final File dbFile = new File(db.getPath());
-        mOpenHelper.close();
-        if (dbFile.exists()) {
-            SQLiteDatabase.deleteDatabase(dbFile);
-        }
-        mOpenHelper = new DatabaseHelper(getContext(), this);
-    }
-
     /**
      * Send notification that we've deleted the {@link AppWidgetHost},
      * probably as part of the initial database creation. The receiver may