From 8c95065cb7230fabd7c6f5533d86f666a50823e7 Mon Sep 17 00:00:00 2001 From: Maryam Karimzadehgan Date: Mon, 5 Oct 2020 18:05:46 -0700 Subject: [PATCH] Add package_name to log for debugging the back gesture model. Test: manual. Bug: 150170384 Change-Id: I94efa3ec6af62b485c45f9bf17861722b73ecca3 Merged-In: I94efa3ec6af62b485c45f9bf17861722b73ecca3 --- cmds/statsd/src/atoms.proto | 5 +++-- .../systemui/statusbar/phone/EdgeBackGestureHandler.java | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 0c1c577516e65..2bc153189e167 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -3038,8 +3038,9 @@ message BackGesture { optional int32 end_y = 7; // Y coordinate for ACTION_MOVE event. optional int32 left_boundary = 8; // left edge width + left inset optional int32 right_boundary = 9; // screen width - (right edge width + right inset) - optional float ml_model_score = 10; // The score between 0 and 1 which is the prediction output - // for the Back Gesture model. + // The score between 0 and 1 which is the prediction output for the Back Gesture model. + optional float ml_model_score = 10; + optional string package_name = 11; // The name of the top 100 most used package by all users. enum WindowHorizontalLocation { DEFAULT_LOCATION = 0; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java index ad071c865de47..3271abe313f9f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java @@ -592,6 +592,11 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa return; } mLogGesture = false; + String logPackageName = ""; + // Due to privacy, only top 100 most used apps by all users can be logged. + if (mUseMLModel && mVocab.containsKey(mPackageName) && mVocab.get(mPackageName) < 100) { + logPackageName = mPackageName; + } SysUiStatsLog.write(SysUiStatsLog.BACK_GESTURE_REPORTED_REPORTED, backType, (int) mDownPoint.y, mIsOnLeftEdge ? SysUiStatsLog.BACK_GESTURE__X_LOCATION__LEFT @@ -600,7 +605,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa (int) mEndPoint.x, (int) mEndPoint.y, mEdgeWidthLeft + mLeftInset, mDisplaySize.x - (mEdgeWidthRight + mRightInset), - mUseMLModel ? mMLResults : -2); + mUseMLModel ? mMLResults : -2, logPackageName); } private void onMotionEvent(MotionEvent ev) {