PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change screensaver option to be available to MainUser.

Browse Source 
Bug: 262568884
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: Ic9a9fc727cd0ce5311faa3dfc6e0ca8ce47605d7
This commit is contained in:
Victor Truong
2022-12-15 11:58:52 -05:00
parent cb4edec31b
commit f03a60c67e
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/display/ScreenSaverPreferenceController.java
View File

@@ -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();
}
}