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

Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-09 17:37:19 +00:00
committed by Android (Google) Code Review
parent e338a41dac f9429262d2
commit dc2db6c6c9
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/VisibilityPreferenceController.java
View File

@@ -147,8 +147,10 @@ public class VisibilityPreferenceController extends NotificationPreferenceContro
} }
private boolean getLockscreenNotificationsEnabled() { private boolean getLockscreenNotificationsEnabled() {
return Settings.Secure.getInt(mContext.getContentResolver(), final UserInfo parentUser = mUm.getProfileParent(UserHandle.myUserId());
Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0; final int primaryUserId = parentUser != null ? parentUser.id : UserHandle.myUserId();
return Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0, primaryUserId) != 0;
} }
private boolean getLockscreenAllowPrivateNotifications() { private boolean getLockscreenAllowPrivateNotifications() {

25
tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
View File

@@ -208,6 +208,31 @@ public class VisibilityPreferenceControllerTest {
.contains(String.valueOf(VISIBILITY_PRIVATE))); .contains(String.valueOf(VISIBILITY_PRIVATE)));
} }
@Test
public void testUpdateState_noLockScreenNotificationsGloballyInProfile() {
final int primaryUserId = 2;
final UserInfo primaryUserInfo = new UserInfo(primaryUserId, "user 2", 0);
when(mUm.getProfileParent(anyInt())).thenReturn(primaryUserInfo);
Settings.Secure.putIntForUser(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0, primaryUserId);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
mController.onResume(appRow, channel, null, null);
RestrictedListPreference pref = mock(RestrictedListPreference.class);
mController.updateState(pref);
ArgumentCaptor<CharSequence[]> argumentCaptor =
ArgumentCaptor.forClass(CharSequence[].class);
verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
assertFalse(toStringList(argumentCaptor.getValue())
.contains(String.valueOf(VISIBILITY_NO_OVERRIDE)));
assertFalse(toStringList(argumentCaptor.getValue())
.contains(String.valueOf(VISIBILITY_PRIVATE)));
}
@Test @Test
public void testUpdateState_noPrivateLockScreenNotificationsGlobally() { public void testUpdateState_noPrivateLockScreenNotificationsGlobally() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),