am ca3a3650: am 6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev
* commit 'ca3a3650e41449eb9d3b9643e844b7506d77759f':
Instrument printing service for metrics collection.
diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java b/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java
index 49e6740..bafccae 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/model/PrintSpoolerService.java
@@ -46,6 +46,7 @@
import android.util.Slog;
import android.util.Xml;
+import com.android.internal.logging.MetricsLogger;
import com.android.internal.os.HandlerCaller;
import com.android.internal.util.FastXmlSerializer;
import com.android.printspooler.R;
@@ -493,6 +494,7 @@
Slog.i(LOG_TAG, "[STATE CHANGED] " + printJob);
}
+ MetricsLogger.histogram(this, "print_job_state", state);
switch (state) {
case PrintJobInfo.STATE_COMPLETED:
case PrintJobInfo.STATE_CANCELED:
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index 6baa4b3..e8a5e43 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -72,6 +72,7 @@
import android.widget.Spinner;
import android.widget.TextView;
+import com.android.internal.logging.MetricsLogger;
import com.android.printspooler.R;
import com.android.printspooler.model.MutexFileProvider;
import com.android.printspooler.model.PrintSpoolerProvider;
@@ -325,6 +326,7 @@
if (mState != STATE_INITIALIZING && mCurrentPrinter != null) {
mPrinterRegistry.setTrackedPrinter(mCurrentPrinter.getId());
}
+ MetricsLogger.count(this, "print_preview", 1);
}
@Override
@@ -1074,6 +1076,8 @@
private void confirmPrint() {
setState(STATE_PRINT_CONFIRMED);
+ MetricsLogger.count(this, "print_confirmed", 1);
+
updateOptionsUi();
addCurrentPrinterToHistory();