1 files changed, 22 insertions, 44 deletions

diff --git a/src/com/android/launcher3/stats/external/StatsUtil.java b/src/com/android/launcher3/stats/external/StatsUtil.java
index 697df542c..da8e94e6d 100644
--- a/src/com/android/launcher3/stats/external/StatsUtil.java
+++ b/src/com/android/launcher3/stats/external/StatsUtil.java
@@ -24,7 +24,10 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
+
+import com.android.launcher3.LauncherApplication;
 import com.android.launcher3.stats.util.Logger;
+import com.cyanogen.ambient.analytics.Event;
 
 /**
  * StatsUtil
@@ -39,42 +42,6 @@ public class StatsUtil {
 
     // Constants
     private static final String KEY_TRACKING_ID = "tracking_id";
-    private static final String ANALYTIC_INTENT = "com.cyngn.stats.action.SEND_ANALYTIC_EVENT";
-    private static final String STATS_PACKAGE = "com.cyngn.stats";
-
-    /**
-     * Checks if stats collection is enabled
-     *
-     * @param context {@link android.content.Context}
-     * @return {@link java.lang.Boolean}
-     * @throws IllegalArgumentException {@link IllegalArgumentException}
-     */
-    public static boolean isStatsCollectionEnabled(Context context)
-            throws IllegalArgumentException {
-        return isStatsPackageInstalledAndSystemApp(context);
-    }
-
-    /**
-     * Checks if the stats package is installed
-     *
-     * @param context {@link android.content.Context}
-     * @return {@link Boolean {@link Boolean {@link Boolean {@link Boolean}}}}
-     */
-    private static boolean isStatsPackageInstalledAndSystemApp(Context context)
-            throws IllegalArgumentException {
-        if (context == null) {
-            throw new IllegalArgumentException("'context' cannot be null!");
-        }
-        try {
-            PackageInfo pi = context.getPackageManager().getPackageInfo(STATS_PACKAGE, 0);
-            boolean isSystemApp = (pi.applicationInfo.flags &
-                    (ApplicationInfo.FLAG_SYSTEM | ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) != 0;
-            return pi.applicationInfo.enabled && isSystemApp;
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "stats not found!");
-            return false;
-        }
-    }
 
     /**
      * Send an event to CyangenStats
@@ -91,23 +58,34 @@ public class StatsUtil {
         if (trackingBundle == null) {
             throw new IllegalArgumentException("'trackingBundle' cannot be null!");
         }
-        if (!isStatsCollectionEnabled(context)) {
-            Logger.logd(TAG, "Stats collection: DISABLED!");
-            return;
-        }
         Logger.logd(TAG, "Stats collection: ENABLED!");
 
-        Intent newIntent = new Intent(ANALYTIC_INTENT);
-
         if (!trackingBundle.containsKey(KEY_TRACKING_ID)) {
             Logger.logd(TAG, "No tracking id in bundle");
             return;
         } else {
             if (trackingBundle.containsKey(TrackingBundle.KEY_EVENT_CATEGORY)
                     && trackingBundle.containsKey(TrackingBundle.KEY_EVENT_ACTION)) {
+
+                final Event.Builder builder = new Event.Builder(
+                        trackingBundle.getString(TrackingBundle.KEY_EVENT_CATEGORY),
+                        trackingBundle.getString(TrackingBundle.KEY_EVENT_ACTION));
+
+                if (trackingBundle.containsKey(TrackingBundle.KEY_METADATA_ORIGIN)) {
+                    builder.addField(TrackingBundle.KEY_METADATA_ORIGIN,
+                            trackingBundle.getString(TrackingBundle.KEY_METADATA_ORIGIN));
+                }
+                if (trackingBundle.containsKey(TrackingBundle.KEY_METADATA_PACKAGE)) {
+                    builder.addField(TrackingBundle.KEY_METADATA_PACKAGE,
+                            trackingBundle.getString(TrackingBundle.KEY_METADATA_PACKAGE));
+                }
+                if (trackingBundle.containsKey(TrackingBundle.KEY_METADATA_VALUE)) {
+                    builder.addField(TrackingBundle.KEY_METADATA_VALUE,
+                            String.valueOf(trackingBundle.get(TrackingBundle.KEY_METADATA_VALUE)));
+                }
+                ((LauncherApplication)context.getApplicationContext()).sendEvent(builder.build());
+
                 Logger.logd(TAG, trackingBundle.toString());
-                newIntent.putExtras(trackingBundle);
-                context.sendBroadcast(newIntent);
             } else {
                 Logger.logd(TAG, "Not a valid tracking bundle");
             }