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

Merge "Prevent guest users from toggling "hide silent notifications"" into udc-dev am: 5755bbdd60

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252122

Change-Id: I64b5ce9f98653c5bf93a2877ea540bddece6376f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matías Hernández
2023-03-27 15:48:44 +00:00
committed by Automerger Merge Worker
parent 345616175f 5755bbdd60
commit 40e4a4b3c2
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/notification/SilentStatusBarPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.notification;
import android.content.Context;
import android.os.UserManager;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
@@ -51,7 +52,7 @@ public class SilentStatusBarPreferenceController extends TogglePreferenceControl
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
return UserManager.get(mContext).isGuestUser() ? DISABLED_FOR_USER : AVAILABLE;
}
@Override

29
tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java
View File

@@ -16,14 +16,21 @@
package com.android.settings.notification;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
import android.content.Context;
import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -35,6 +42,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowUserManager;
@RunWith(RobolectricTestRunner.class)
public class SilentStatusBarPreferenceControllerTest {
@@ -59,6 +67,27 @@ public class SilentStatusBarPreferenceControllerTest {
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@Test
public void isAvailable_systemUser_available() {
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void isAvailable_extraUser_available() {
ShadowUserManager um = shadowOf(mContext.getSystemService(UserManager.class));
um.addUser(UserHandle.myUserId(), "Another User", UserInfo.FLAG_FULL);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void isAvailable_guestUser_disabled() {
ShadowUserManager um = shadowOf(mContext.getSystemService(UserManager.class));
um.addUser(UserHandle.myUserId(), "Guest", UserInfo.FLAG_GUEST);
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_FOR_USER);
}
@Test
public void isChecked_settingIsOff() {
when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(false);