From f03a60c67e5e9cd2be6c007879986008ed728367 Mon Sep 17 00:00:00 2001
From: Victor Truong <truongvi@google.com>
Date: Thu, 15 Dec 2022 11:58:52 -0500
Subject: [PATCH] Change screensaver option to be available to MainUser.

Bug: 262568884
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: Ic9a9fc727cd0ce5311faa3dfc6e0ca8ce47605d7
---
 .../ScreenSaverPreferenceController.java      |  8 ++------
 .../ScreenSaverPreferenceControllerTest.java  | 20 +++++++++----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java
index db4bc37054a..ca027f45d28 100644
--- a/src/com/android/settings/display/ScreenSaverPreferenceController.java
+++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java
@@ -39,8 +39,9 @@ public class ScreenSaverPreferenceController extends BasePreferenceController im
                 com.android.internal.R.bool.config_dreamsSupported);
         final boolean dreamsOnlyEnabledForDockUser = mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser);
+        final UserManager userManager = mContext.getSystemService(UserManager.class);
         // TODO(b/257333623): Allow the Dock User to be non-SystemUser user in HSUM.
-        return (dreamsSupported && (!dreamsOnlyEnabledForDockUser || isSystemUser()))
+        return (dreamsSupported && (!dreamsOnlyEnabledForDockUser || userManager.isMainUser()))
                 ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
@@ -53,9 +54,4 @@ public class ScreenSaverPreferenceController extends BasePreferenceController im
             return DreamSettings.getSummaryTextWithDreamName(mContext);
         }
     }
-
-    private boolean isSystemUser() {
-        final UserManager userManager = mContext.getSystemService(UserManager.class);
-        return userManager.isSystemUser();
-    }
 }
diff --git a/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
index 180ea90925f..17ecbf83ae8 100644
--- a/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
@@ -58,57 +58,57 @@ public class ScreenSaverPreferenceControllerTest {
     }
 
     @Test
-    public void isAvailable_dreamsEnabledForAllUsers_shouldBeTrueForSystemUser() {
+    public void isAvailable_dreamsEnabledForAllUsers_shouldBeTrueForMainUser() {
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
                 .thenReturn(false);
-        when(mUserManager.isSystemUser()).thenReturn(true);
+        when(mUserManager.isMainUser()).thenReturn(true);
         assertTrue(mController.isAvailable());
     }
 
     @Test
-    public void isAvailable_dreamsEnabledForAllUsers_shouldBeTrueForNonSystemUser() {
+    public void isAvailable_dreamsEnabledForAllUsers_shouldBeTrueForNonMainUser() {
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
                 .thenReturn(false);
-        when(mUserManager.isSystemUser()).thenReturn(false);
+        when(mUserManager.isMainUser()).thenReturn(false);
         assertTrue(mController.isAvailable());
     }
 
     @Test
-    public void isAvailable_dreamsDisabled_shouldBeFalseForSystemUser() {
+    public void isAvailable_dreamsDisabled_shouldBeFalseForMainUser() {
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported)).thenReturn(false);
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
                 .thenReturn(false);
-        when(mUserManager.isSystemUser()).thenReturn(true);
+        when(mUserManager.isMainUser()).thenReturn(true);
         assertFalse(mController.isAvailable());
     }
 
     @Test
-    public void isAvailable_dreamsOnlyEnabledForSystemUser_shouldBeTrueForSystemUser() {
+    public void isAvailable_dreamsOnlyEnabledForDockUser_shouldBeTrueForMainUser() {
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
                 .thenReturn(true);
-        when(mUserManager.isSystemUser()).thenReturn(true);
+        when(mUserManager.isMainUser()).thenReturn(true);
         assertTrue(mController.isAvailable());
     }
 
     @Test
-    public void isAvailable_dreamsOnlyEnabledForSystemUser_shouldBeFalseForNonSystemUser() {
+    public void isAvailable_dreamsOnlyEnabledForDockUser_shouldBeFalseForNonMainUser() {
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsSupported)).thenReturn(true);
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser))
                 .thenReturn(true);
-        when(mUserManager.isSystemUser()).thenReturn(false);
+        when(mUserManager.isMainUser()).thenReturn(false);
         assertFalse(mController.isAvailable());
     }
 }