Cleaning up LauncherModel

- performing all DB operations immediately if called from worker thread (a previous change that did this in updateItemInDatabase fixed an outstanding bug)
- centralizing logic to do database updates
- removing old logging code

Change-Id: Idc7bfef3921828ff7c5492b8e996c0a07e1ec508

1 files changed, 5 insertions, 7 deletions

diff --git a/src/com/android/launcher2/ApplicationInfo.java b/src/com/android/launcher2/ApplicationInfo.java
index bbca66445..1fc1d1f55 100644
--- a/src/com/android/launcher2/ApplicationInfo.java
+++ b/src/com/android/launcher2/ApplicationInfo.java
@@ -60,8 +60,7 @@ class ApplicationInfo extends ItemInfo {
 
     int flags = 0;
 
-    ApplicationInfo(String whereCreated) {
-        super(whereCreated);
+    ApplicationInfo() {
         itemType = LauncherSettings.BaseLauncherColumns.ITEM_TYPE_SHORTCUT;
     }
 
@@ -69,8 +68,7 @@ class ApplicationInfo extends ItemInfo {
      * Must not hold the Context.
      */
     public ApplicationInfo(PackageManager pm, ResolveInfo info, IconCache iconCache,
-            HashMap<Object, CharSequence> labelCache, String whereCreated) {
-        super(whereCreated);
+            HashMap<Object, CharSequence> labelCache) {
         final String packageName = info.activityInfo.applicationInfo.packageName;
 
         this.componentName = new ComponentName(packageName, info.activityInfo.name);
@@ -95,8 +93,8 @@ class ApplicationInfo extends ItemInfo {
         iconCache.getTitleAndIcon(this, info, labelCache);
     }
 
-    public ApplicationInfo(ApplicationInfo info, String whereCreated) {
-        super(info, whereCreated);
+    public ApplicationInfo(ApplicationInfo info) {
+        super(info);
         componentName = info.componentName;
         title = info.title.toString();
         intent = new Intent(info.intent);
@@ -135,6 +133,6 @@ class ApplicationInfo extends ItemInfo {
     }
 
     public ShortcutInfo makeShortcut() {
-        return new ShortcutInfo(this, "18");
+        return new ShortcutInfo(this);
     }
 }