commit d91a1eeb4ec6866aa1132623edb9bcc00ee75a79
author Beverly <beverlyt@google.com> Wed May 16 08:31:43 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 16 08:31:43 2018 -0700
tree eb647688b78430ecdd1df491be989eb7e1a4fdf5
parent 44aaa2a034694ba00277f7b01911dba2d0040f02
parent a3cb0ae74a4f5c7e840ff6d7e245bd9c9632d35f

Merge "Add metric to log use of hush gesture" into pi-dev am: 2b0ead73c7
am: a3cb0ae74a

Change-Id: I132929f9218013bffe904b69c549070816486428

proto/src/metrics_constants.proto

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index f49cbc1..c43ec54 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -5969,6 +5969,11 @@
     // OS: P
     FIELD_BATTERY_CHARGE_CYCLES = 1439;
 
+    // ACTION: Hush gesture - volume up + power button
+    // CATEGORY: GLOBAL_SYSTEM_UI
+    // OS: P
+    ACTION_HUSH_GESTURE = 1440;
+
     // ---- End P Constants, all P constants go above this line ----
 
     // First Q constant in master goes here:

services/core/java/com/android/server/policy/PhoneWindowManager.java

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 0792acd..b581c8e 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -267,6 +267,7 @@
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.policy.IKeyguardDismissCallback;
 import com.android.internal.policy.IShortcutService;
 import com.android.internal.policy.KeyguardDismissCallback;
@@ -621,6 +622,7 @@
     boolean mUseTvRouting;
     int mVeryLongPressTimeout;
     boolean mAllowStartActivityForLongPressOnPowerDuringSetup;
+    MetricsLogger mLogger;
 
     private boolean mHandleVolumeKeysInWM;
 
@@ -1136,6 +1138,7 @@
         }
         getAudioManagerInternal();
         mAudioManagerInternal.silenceRingerModeInternal("volume_hush");
+        mLogger.action(MetricsProto.MetricsEvent.ACTION_HUSH_GESTURE, mRingerToggleChord);
     }
 
     IStatusBarService getStatusBarService() {
@@ -2003,6 +2006,7 @@
         mHasFeatureLeanback = mContext.getPackageManager().hasSystemFeature(FEATURE_LEANBACK);
         mAccessibilityShortcutController =
                 new AccessibilityShortcutController(mContext, new Handler(), mCurrentUserId);
+        mLogger = new MetricsLogger();
         // Init display burn-in protection
         boolean burnInProtectionEnabled = context.getResources().getBoolean(
                 com.android.internal.R.bool.config_enableBurnInProtection);