Merge "Add tests for guest user events" into sc-dev

2021-05-12 03:59:44 +00:00
parent bc4f3817da c24234c301
commit abd44a8a2e
3 changed files with 43 additions and 3 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -829,13 +829,14 @@ public class UserSettings extends SettingsPreferenceFragment
    /**
     * Erase the current user (guest) and switch to another user.
     */
-    private void exitGuest() {
+    @VisibleForTesting
+    void exitGuest() {
        // Just to be safe
-        mMetricsFeatureProvider.action(getActivity(),
-                SettingsEnums.ACTION_USER_GUEST_EXIT_CONFIRMED);
        if (!isCurrentUserGuest()) {
            return;
        }
+        mMetricsFeatureProvider.action(getActivity(),
+                SettingsEnums.ACTION_USER_GUEST_EXIT_CONFIRMED);
        removeThisUser();
    }