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

Replace SystemUser checks with MainUser.

Browse Source 
Bug: 257333623
Test: atest CommunalPreferenceControllerTest, atest UtilsTest, atest
TimeoutToDockUserPreferenceControllerTest

Change-Id: I5d2a818f9f35968ced1db7f9fa4b79432a502023
This commit is contained in:
Victor Truong
2023-01-20 10:49:41 -05:00
parent 4e03bc2133
commit f3c9a09cac
7 changed files with 78 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/users/TimeoutToDockUserPreferenceController.java
View File

@@ -24,6 +24,7 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import java.util.Arrays;
@@ -67,9 +68,7 @@ public class TimeoutToDockUserPreferenceController extends BasePreferenceControl
return CONDITIONALLY_UNAVAILABLE;
}
// Is currently user zero. Only non user zero can have this setting.
// TODO(b/257333623): Allow the Dock User to be non-SystemUser user in HSUM.
if (UserHandle.myUserId() == UserHandle.USER_SYSTEM) {
if (Utils.canCurrentUserDream(mContext)) {
return DISABLED_FOR_USER;
}