Merge "Support onUserStarted / onUserStopped / onUserSwitched in TestDPC" into ub-testdpc-pic

Author: TreeHugger Robot

app/src/main/java/com/afwsamples/testdpc/DeviceAdminReceiver.java

@@ -286,24 +286,36 @@ public void onBugreportFailed(Context context, Intent intent, int failureCode) {
     @TargetApi(Build.VERSION_CODES.O)
     @Override
     public void onUserAdded(Context context, Intent intent, UserHandle newUser) {
-        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        String message = context.getString(R.string.on_user_added_message,
-                userManager.getSerialNumberForUser(newUser));
-        Log.i(TAG, message);
-        NotificationUtil.showNotification(context, R.string.on_user_added_title,
-                message,
-                NotificationUtil.USER_ADDED_NOTIFICATION_ID);
+        handleUserAction(context, newUser, R.string.on_user_added_title,
+                R.string.on_user_added_message, NotificationUtil.USER_ADDED_NOTIFICATION_ID);
     }
 
     @TargetApi(Build.VERSION_CODES.O)
     @Override
     public void onUserRemoved(Context context, Intent intent, UserHandle removedUser) {
-        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        String message = context.getString(R.string.on_user_removed_message,
-                userManager.getSerialNumberForUser(removedUser));
-        Log.i(TAG, message);
-        NotificationUtil.showNotification(context, R.string.on_user_removed_title, message,
-                NotificationUtil.USER_REMOVED_NOTIFICATION_ID);
+        handleUserAction(context, removedUser, R.string.on_user_removed_title,
+                R.string.on_user_removed_message, NotificationUtil.USER_REMOVED_NOTIFICATION_ID);
+    }
+
+    @TargetApi(Build.VERSION_CODES.P)
+    @Override
+    public void onUserStarted(Context context, Intent intent, UserHandle startedUser) {
+        handleUserAction(context, startedUser, R.string.on_user_started_title,
+                R.string.on_user_started_message, NotificationUtil.USER_STARTED_NOTIFICATION_ID);
+    }
+
+    @TargetApi(Build.VERSION_CODES.P)
+    @Override
+    public void onUserStopped(Context context, Intent intent, UserHandle stoppedUser) {
+        handleUserAction(context, stoppedUser, R.string.on_user_stopped_title,
+                R.string.on_user_stopped_message, NotificationUtil.USER_STOPPED_NOTIFICATION_ID);
+    }
+
+    @TargetApi(Build.VERSION_CODES.P)
+    @Override
+    public void onUserSwitched(Context context, Intent intent, UserHandle switchedUser) {
+        handleUserAction(context, switchedUser, R.string.on_user_switched_title,
+                R.string.on_user_switched_message, NotificationUtil.USER_SWITCHED_NOTIFICATION_ID);
     }
 
     @TargetApi(Build.VERSION_CODES.M)
@@ -636,4 +648,13 @@ public void onTransferAffiliatedProfileOwnershipComplete(Context context, UserHa
                 context.getString(R.string.transfer_ownership_affiliated_complete_message, user),
                 NotificationUtil.TRANSFER_AFFILIATED_PROFILE_OWNERSHIP_COMPLETE_ID);
     }
+
+    private void handleUserAction(Context context, UserHandle userHandle, int titleResId,
+            int messageResId, int notificationId) {
+        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        String message = context.getString(messageResId,
+                userManager.getSerialNumberForUser(userHandle));
+        Log.i(TAG, message);
+        NotificationUtil.showNotification(context, titleResId, message, notificationId);
+    }
 }

app/src/main/java/com/afwsamples/testdpc/common/NotificationUtil.java

@@ -19,10 +19,13 @@ public class NotificationUtil {
     public static final int PASSWORD_EXPIRATION_NOTIFICATION_ID = 2;
     public static final int USER_ADDED_NOTIFICATION_ID = 3;
     public static final int USER_REMOVED_NOTIFICATION_ID = 4;
-    public static final int PROFILE_OWNER_CHANGED_ID = 5;
-    public static final int DEVICE_OWNER_CHANGED_ID = 6;
-    public static final int TRANSFER_OWNERSHIP_COMPLETE_ID = 7;
-    public static final int TRANSFER_AFFILIATED_PROFILE_OWNERSHIP_COMPLETE_ID = 8;
+    public static final int USER_STARTED_NOTIFICATION_ID = 5;
+    public static final int USER_STOPPED_NOTIFICATION_ID = 6;
+    public static final int USER_SWITCHED_NOTIFICATION_ID = 7;
+    public static final int PROFILE_OWNER_CHANGED_ID = 8;
+    public static final int DEVICE_OWNER_CHANGED_ID = 9;
+    public static final int TRANSFER_OWNERSHIP_COMPLETE_ID = 10;
+    public static final int TRANSFER_AFFILIATED_PROFILE_OWNERSHIP_COMPLETE_ID = 11;
 
     public static void showNotification(
             Context context, @StringRes int titleId, String msg, int notificationId) {

app/src/main/res/values/strings.xml

@@ -645,8 +645,14 @@
     <string name="ephemeral_user">Ephemeral user</string>
     <string name="on_user_added_title">User Created</string>
     <string name="on_user_removed_title">User Removed</string>
+    <string name="on_user_started_title">User Started</string>
+    <string name="on_user_stopped_title">User Stopped</string>
+    <string name="on_user_switched_title">User Switched</string>
     <string name="on_user_added_message">User created with serial number %1$d.</string>
     <string name="on_user_removed_message">User with serial number %1$d removed.</string>
+    <string name="on_user_started_message">User with serial number %1$d started.</string>
+    <string name="on_user_stopped_message">User with serial number %1$d stopped.</string>
+    <string name="on_user_switched_message">User with serial number %1$d switched.</string>
     <string name="no_secondary_users_available">No secondary users available.</string>
 
     <!-- Affiliation ids -->