diff options
author | Roman Birg <roman@cyngn.com> | 2016-04-22 11:59:14 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-04-29 16:31:59 -0700 |
commit | 097b9503f45ae2a50c501fa95d13776d656621bb (patch) | |
tree | 1351993bbcd65d10ab0901649d766fffa9b1ef9d /src/com/android/launcher3 | |
parent | 4ed36691e3a76bf36903be270a5165cf3069dcac (diff) | |
download | android_packages_apps_Trebuchet-097b9503f45ae2a50c501fa95d13776d656621bb.tar.gz android_packages_apps_Trebuchet-097b9503f45ae2a50c501fa95d13776d656621bb.tar.bz2 android_packages_apps_Trebuchet-097b9503f45ae2a50c501fa95d13776d656621bb.zip |
Trebuchet: send metrics directly when possible
Use the SDK directly instead of relying on an external package.
Still relies on C-Apps Core to send.
Ticket: CYNGNOS-2545
Change-Id: I1af8106917e77b9ba70c57f18f5894087fc2f274
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/LauncherApplication.java | 14 | ||||
-rw-r--r-- | src/com/android/launcher3/stats/external/StatsUtil.java | 66 |
2 files changed, 36 insertions, 44 deletions
diff --git a/src/com/android/launcher3/LauncherApplication.java b/src/com/android/launcher3/LauncherApplication.java index 4bbcec073..896963e6d 100644 --- a/src/com/android/launcher3/LauncherApplication.java +++ b/src/com/android/launcher3/LauncherApplication.java @@ -20,10 +20,14 @@ import android.app.Application; import com.android.launcher3.stats.LauncherStats; import com.android.launcher3.stats.internal.service.AggregationIntentService; +import com.cyanogen.ambient.analytics.AnalyticsServices; +import com.cyanogen.ambient.analytics.Event; +import com.cyanogen.ambient.common.api.AmbientApiClient; public class LauncherApplication extends Application { private static LauncherStats sLauncherStats = null; + private AmbientApiClient mClient; /** * Get the reference handle for LauncherStats commands @@ -37,8 +41,18 @@ public class LauncherApplication extends Application { @Override public void onCreate() { super.onCreate(); + mClient = new AmbientApiClient.Builder(this) + .addApi(AnalyticsServices.API) + .build(); + mClient.connect(); sLauncherStats = LauncherStats.getInstance(this); AggregationIntentService.scheduleService(this); } + public void sendEvent(Event event) { + if (mClient.isConnected()) { + AnalyticsServices.AnalyticsApi.sendEvent(mClient, event); + } + } + } 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"); } |