summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2015-03-30 18:31:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-30 18:31:44 +0000
commit469d94490ed9cf3e08610250a3358bdd83d618a6 (patch)
tree99724b74c70d108d6bf603ea8a465bdc74cfb8f9 /core
parent523fe91af4baf26cd26e46c1418a072574959b73 (diff)
parent4902da45a76e55fd86463743f0fe5b427dcc8349 (diff)
downloadframeworks_base-469d94490ed9cf3e08610250a3358bdd83d618a6.zip
frameworks_base-469d94490ed9cf3e08610250a3358bdd83d618a6.tar.gz
frameworks_base-469d94490ed9cf3e08610250a3358bdd83d618a6.tar.bz2
Merge "add a mechanism for logging actions"
Diffstat (limited to 'core')
-rw-r--r--core/java/com/android/internal/logging/EventLogTags.logtags2
-rw-r--r--core/java/com/android/internal/logging/MetricsLogger.java14
2 files changed, 15 insertions, 1 deletions
diff --git a/core/java/com/android/internal/logging/EventLogTags.logtags b/core/java/com/android/internal/logging/EventLogTags.logtags
index 9e178df..870d20d 100644
--- a/core/java/com/android/internal/logging/EventLogTags.logtags
+++ b/core/java/com/android/internal/logging/EventLogTags.logtags
@@ -4,4 +4,4 @@ option java_package com.android.internal.logging;
# interaction logs
524287 sysui_view_visibility (category|1|5),(visible|1|6)
-524288 sysui_action (category|1|5),(type|1|6)
+524288 sysui_action (category|1|5)
diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java
index 2de7394..969c8cb 100644
--- a/core/java/com/android/internal/logging/MetricsLogger.java
+++ b/core/java/com/android/internal/logging/MetricsLogger.java
@@ -31,6 +31,13 @@ public class MetricsLogger implements MetricsConstants {
public static final int MANAGE_APPLICATIONS_ALL = 134;
public static final int MANAGE_APPLICATIONS_NOTIFICATIONS = 135;
+ public static final int ACTION_WIFI_ADD_NETWORK = 136;
+ public static final int ACTION_WIFI_CONNECT = 137;
+ public static final int ACTION_WIFI_FORCE_SCAN = 138;
+ public static final int ACTION_WIFI_FORGET = 139;
+ public static final int ACTION_WIFI_OFF = 140;
+ public static final int ACTION_WIFI_ON = 141;
+
public static void visible(Context context, int category) throws IllegalArgumentException {
if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {
throw new IllegalArgumentException("Must define metric category");
@@ -44,4 +51,11 @@ public class MetricsLogger implements MetricsConstants {
}
EventLogTags.writeSysuiViewVisibility(category, 0);
}
+
+ public static void action(Context context, int category) {
+ if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {
+ throw new IllegalArgumentException("Must define metric category");
+ }
+ EventLogTags.writeSysuiAction(category);
+ }
}