commit 5ab7aa376c8d44321104ef811cb4bf70e6e8e235
author bkchoi <bkchoi@google.com> Tue Apr 27 11:50:53 2021 -0700
committer bkchoi <bkchoi@google.com> Thu Apr 29 11:14:06 2021 -0700
tree a8e14b5d123814ecd12fb15bcde98ce4216f7fe7
parent 4ba739ff81cdee9653f9d651616f0b6438523e1f

Add a new API method: CarDevicePolicyManager#startUserInBackground
as a TestApi.

Test: atest CarDevicePolicyManagerTest CarDevicePolicyManagerUnitTest \
      CarDevicePolicyManagerPermissionTest CarDevicePolicyServiceTest \
      CarUserServiceTest StartUserInBackgroundResultTest

Bug: 181331178
Change-Id: Ifcb231d83e4e8cd4cb1e713e3b34b6161c0b5c16

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 5439236..4e24b56 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -1850,6 +1850,9 @@
      */
     public void startUserInBackground(@UserIdInt int userId,
             @NonNull AndroidFuture<UserStartResult> receiver) {
+        checkManageOrCreateUsersPermission("startUserInBackground");
+        EventLog.writeEvent(EventLogTags.CAR_USER_SVC_START_USER_IN_BACKGROUND_REQ, userId);
+
         mHandler.post(() -> handleStartUserInBackground(userId, receiver));
     }
 
@@ -1857,20 +1860,21 @@
             @NonNull AndroidFuture<UserStartResult> receiver) {
         // If the requested user is the current user, do nothing and return success.
         if (ActivityManager.getCurrentUser() == userId) {
-            sendUserStartResult(UserStartResult.STATUS_SUCCESSFUL_USER_IS_CURRENT_USER, receiver);
+            sendUserStartResult(
+                    userId, UserStartResult.STATUS_SUCCESSFUL_USER_IS_CURRENT_USER, receiver);
             return;
         }
         // If requested user does not exist, return error.
         if (mUserManager.getUserInfo(userId) == null) {
             Slogf.w(TAG, "User %d does not exist", userId);
-            sendUserStartResult(UserStartResult.STATUS_USER_DOES_NOT_EXIST, receiver);
+            sendUserStartResult(userId, UserStartResult.STATUS_USER_DOES_NOT_EXIST, receiver);
             return;
         }
 
         try {
             if (!mAm.startUserInBackground(userId)) {
                 Slogf.w(TAG, "Failed to start user %d in background", userId);
-                sendUserStartResult(UserStartResult.STATUS_ANDROID_FAILURE, receiver);
+                sendUserStartResult(userId, UserStartResult.STATUS_ANDROID_FAILURE, receiver);
                 return;
             }
         } catch (RemoteException e) {
@@ -1880,12 +1884,13 @@
         // TODO(b/181331178): We are not updating mBackgroundUsersToRestart or
         // mBackgroundUsersRestartedHere, which were only used for the garage mode. Consider
         // renaming them to make it more clear.
-        sendUserStartResult(UserStartResult.STATUS_SUCCESSFUL, receiver);
+        sendUserStartResult(userId, UserStartResult.STATUS_SUCCESSFUL, receiver);
     }
 
-    private void sendUserStartResult(@UserStartResult.Status int result,
+    private void sendUserStartResult(@UserIdInt int userId, @UserStartResult.Status int result,
             @NonNull AndroidFuture<UserStartResult> receiver) {
-        // TODO(b/181331178): Add event log calls.
+        EventLog.writeEvent(
+                EventLogTags.CAR_USER_SVC_START_USER_IN_BACKGROUND_RESP, userId, result);
         receiver.complete(new UserStartResult(result));
     }