commit e93218b85c5e7dcd5c9f47707d43545b4fc39228
author Felipe Leme <felipeal@google.com> Thu Feb 13 14:10:52 2020 -0800
committer Felipe Leme <felipeal@google.com> Wed Feb 19 19:21:14 2020 -0800
tree ce04677df72a4b984df733fb191242c77e0f119c
parent 179476102b60c24fc6a8f9f948fbe3b48ad60161

Added user-switching metrics to CarService.

Test: atest CarServicesTest:com.android.internal.car.CarHelperServiceTest
Test: adb shell dumpsys car_service --user-metrics

Bug: 144120654
Bug: 146207078
Bug: 141388849

Change-Id: I6a1528b1554ef96ef7d27879a47475cb70b53a34

service/src/com/android/car/ICarImpl.java

diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index 36a5154..a6c1e58 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -25,6 +25,7 @@
 import android.car.CarFeatures;
 import android.car.ICar;
 import android.car.cluster.renderer.IInstrumentClusterNavigation;
+import android.car.user.CarUserManager;
 import android.car.userlib.CarUserManagerHelper;
 import android.content.ComponentName;
 import android.content.Context;
@@ -66,6 +67,7 @@
 import com.android.car.trust.CarTrustedDeviceService;
 import com.android.car.user.CarUserNoticeService;
 import com.android.car.user.CarUserService;
+import com.android.car.user.UserMetrics;
 import com.android.car.vms.VmsBrokerService;
 import com.android.car.vms.VmsClientManager;
 import com.android.car.vms.VmsNewBrokerService;
@@ -149,6 +151,8 @@
 
     private final String mVehicleInterfaceName;
 
+    private final UserMetrics mUserMetrics = new UserMetrics();
+
     public ICarImpl(Context serviceContext, IVehicle vehicle, SystemInterface systemInterface,
             CanBusErrorNotifier errorNotifier, String vehicleInterfaceName) {
         this(serviceContext, vehicle, systemInterface, errorNotifier, vehicleInterfaceName,
@@ -374,6 +378,17 @@
         mCarUserService.onSwitchUser(userId);
     }
 
+    // TODO(b/146207078): this method is currently used just for metrics logging purposes, but we
+    // should fold the other too (onSwitchUser() and setUserLockStatus()) onto it.
+    @Override
+    public void onUserLifecycleEvent(int eventType, long timestampMs, int fromUserId,
+            int toUserId) {
+        assertCallingFromSystemProcess();
+        Log.i(TAG, "onUserLifecycleEvent(" + CarUserManager.lifecycleEventTypeToString(eventType)
+                + ", " + toUserId);
+        mUserMetrics.onEvent(eventType, timestampMs, fromUserId, toUserId);
+    }
+
     @Override
     public boolean isFeatureEnabled(String featureName) {
         return mFeatureController.isFeatureEnabled(featureName);
@@ -647,6 +662,7 @@
             writer.println("*Dump car service*");
             dumpAllServices(writer);
             dumpAllHals(writer);
+            mUserMetrics.dump(writer);
         } else if ("--list".equals(args[0])) {
             dumpListOfServices(writer);
             return;
@@ -679,6 +695,8 @@
         } else if ("--list-hals".equals(args[0])) {
             mHal.dumpListHals(writer);
             return;
+        } else if ("--user-metrics".equals(args[0])) {
+            mUserMetrics.dump(writer);
         } else if ("--help".equals(args[0])) {
             showDumpHelp(writer);
         } else if (Build.IS_USERDEBUG || Build.IS_ENG) {
@@ -718,6 +736,8 @@
         writer.println("--hal [HAL1] [HAL2] [HALN]");
         writer.println("\t  dumps just the specified HALs (or all of them if none specified),");
         writer.println("\t  where HAL is just the class name (like UserHalService)");
+        writer.println("--user-metrics");
+        writer.println("\t  dumps user switching and stopping metrics ");
         writer.println("-h");
         writer.println("\t  shows commands usage (NOTE: commands are not available on USER builds");
         writer.println("[ANYTHING ELSE]");