Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d370182 authored by BK Choi's avatar BK Choi Committed by Automerger Merge Worker
Browse files

Merge "Add UserCompletedEventType#newUserCompletedEventType static method for... 

Merge "Add UserCompletedEventType#newUserCompletedEventType static  method for testing." into tm-dev am: 45af320e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17201483

Change-Id: I43f9d7c48bd1330faa97951bf120f68ff5707c56
parents 35ec7974 45af320e

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

+12 −1
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import android.os.ServiceManager; 
import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManager;





import com.android.internal.annotations.VisibleForTesting;

import com.android.server.pm.UserManagerService;

import com.android.server.pm.UserManagerService;





import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -261,13 +262,23 @@ public abstract class SystemService { 
        public @interface EventTypesFlag {

        public @interface EventTypesFlag {

        }

        }





        private @EventTypesFlag int mEventType;

        private final @EventTypesFlag int mEventType;





        /** @hide */

        /** @hide */

        UserCompletedEventType(@EventTypesFlag int eventType) {

        UserCompletedEventType(@EventTypesFlag int eventType) {

            mEventType = 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}. */

        /** Returns whether one of the events is {@link #onUserStarting}. */

        public boolean includesOnUserStarting() {

        public boolean includesOnUserStarting() {

            return (mEventType & EVENT_TYPE_USER_STARTING) != 0;

            return (mEventType & EVENT_TYPE_USER_STARTING) != 0;