Merge "Add UserCompletedEventType#newUserCompletedEventType static method for testing." into tm-dev

services/core/java/com/android/server/SystemService.java

@@ -32,6 +32,7 @@ import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.server.pm.UserManagerService;
 
 import java.io.PrintWriter;
@@ -261,13 +262,23 @@ public abstract class SystemService {
         public @interface EventTypesFlag {
         }
 
-        private @EventTypesFlag int mEventType;
+        private final @EventTypesFlag int mEventType;
 
         /** @hide */
         UserCompletedEventType(@EventTypesFlag int eventType) {
             mEventType = eventType;
         }
 
+        /**
+         * Creates a new instance of {@link UserCompletedEventType}.
+         * @hide
+         */
+        @VisibleForTesting
+        public static UserCompletedEventType newUserCompletedEventTypeForTest(
+                @EventTypesFlag int eventType) {
+            return new UserCompletedEventType(eventType);
+        }
+
         /** Returns whether one of the events is {@link #onUserStarting}. */
         public boolean includesOnUserStarting() {
             return (mEventType & EVENT_TYPE_USER_STARTING) != 0;