commit 31e730441a53ade676f46c21133f9c2becdf1120
author Mayank Garg <gargmayank@google.com> Thu Jan 23 00:10:38 2020 -0800
committer Mayank Garg <gargmayank@google.com> Mon Jan 27 16:33:59 2020 -0800
tree 2e704a22febeeee9f34691c10f4d6e4ee48d4614
parent a4a4bb6f7323cf3d15aa38b5b31ee10d50eab0da

Replace user switch broadcast by user callback

Bug: 143712534
Test: atest CarServiceTest CarServiceUnitTest
Change-Id: I0bee05ba4ea6e3d283f08db8d54dee40a8617f6f

service/src/com/android/car/user/CarUserService.java

diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index 610a056..5a541e3 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -36,10 +36,12 @@
 import android.location.LocationManager;
 import android.os.Binder;
 import android.os.RemoteException;
+import android.os.Trace;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.util.Log;
+import android.util.TimingsTraceLog;
 
 import com.android.car.CarServiceBase;
 import com.android.car.R;
@@ -83,7 +85,7 @@
     private @UserIdInt int mLastPassengerId;
     /**
      * Background users that will be restarted in garage mode. This list can include the
-     * current foreground user bit the current foreground user should not be restarted.
+     * current foreground user but the current foreground user should not be restarted.
      */
     @GuardedBy("mLockUser")
     private final ArrayList<Integer> mBackgroundUsersToRestart = new ArrayList<>();
@@ -461,12 +463,23 @@
      * @param unlocked Unlocked (={@code true}) or locked (={@code false}).
      */
     public void setUserLockStatus(@UserIdInt int userId, boolean unlocked) {
+        TimingsTraceLog t = new TimingsTraceLog(TAG_USER,
+                Trace.TRACE_TAG_SYSTEM_SERVER);
+        t.traceBegin("onUserLockChanged-" + userId
+                + (unlocked ? "-unlocked" : "-locked"));
         for (UserCallback callback : mUserCallbacks) {
+            t.traceBegin("onUserLockChanged-"
+                    + callback.getClass().getSimpleName());
             callback.onUserLockChanged(userId, unlocked);
+            t.traceEnd();
         }
+        t.traceEnd();
+
         if (!unlocked) { // nothing else to do when it is locked back.
             return;
         }
+
+        t.traceBegin("setUserLockStatus-UnlockTasks-" + userId);
         ArrayList<Runnable> tasks = null;
         synchronized (mLockUser) {
             if (userId == UserHandle.USER_SYSTEM) {
@@ -502,6 +515,7 @@
                 r.run();
             }
         }
+        t.traceEnd();
     }
 
     /**
@@ -594,6 +608,9 @@
      * @param userId User id of new user.
      */
     public void onSwitchUser(@UserIdInt int userId) {
+        TimingsTraceLog t = new TimingsTraceLog(TAG_USER,
+                Trace.TRACE_TAG_SYSTEM_SERVER);
+        t.traceBegin("onSwitchUser-" + userId);
         if (!isSystemUser(userId)) {
             mCarUserManagerHelper.setLastActiveUser(userId);
         }
@@ -605,8 +622,11 @@
             startFirstPassenger(userId);
         }
         for (UserCallback callback : mUserCallbacks) {
+            t.traceBegin("onSwitchUser-" + callback.getClass().getSimpleName());
             callback.onSwitchUser(userId);
+            t.traceEnd();
         }
+        t.traceEnd();
     }
 
     /**