Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "audiomanagertest_cts_dnd" am: abffe558e3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623839

Change-Id: If541a02594455f78d30a4126396c4aa84fa24b6e
This commit is contained in:
Treehugger Robot
2021-03-23 21:54:44 +00:00
committed by Automerger Merge Worker
parent 1b42ecc10a abffe558e3
commit 73ea991b80
1 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
View File

@@ -833,10 +833,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
@Test @Test
public void testDefaultAssistant_overrideDefault() { public void testDefaultAssistant_overrideDefault() {
final int userId = 0; final int userId = mContext.getUserId();
final String testComponent = "package/class"; final String testComponent = "package/class";
final List<UserInfo> userInfos = new ArrayList<>(); final List<UserInfo> userInfos = new ArrayList<>();
userInfos.add(new UserInfo(0, "", 0)); userInfos.add(new UserInfo(userId, "", 0));
final ArraySet<ComponentName> validAssistants = new ArraySet<>(); final ArraySet<ComponentName> validAssistants = new ArraySet<>();
validAssistants.add(ComponentName.unflattenFromString(testComponent)); validAssistants.add(ComponentName.unflattenFromString(testComponent));
when(mActivityManager.isLowRamDevice()).thenReturn(false); when(mActivityManager.isLowRamDevice()).thenReturn(false);
@@ -2393,7 +2393,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
.thenReturn(mTestNotificationChannel); .thenReturn(mTestNotificationChannel);
reset(mListeners); reset(mListeners);
mBinderService.updateNotificationChannelForPackage(PKG, 0, mTestNotificationChannel); mBinderService.updateNotificationChannelForPackage(PKG, mUid, mTestNotificationChannel);
verify(mListeners, times(1)).notifyNotificationChannelChanged(eq(PKG), verify(mListeners, times(1)).notifyNotificationChannelChanged(eq(PKG),
eq(Process.myUserHandle()), eq(mTestNotificationChannel), eq(Process.myUserHandle()), eq(mTestNotificationChannel),
eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED)); eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED));
@@ -2929,7 +2929,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
@Test @Test
public void testSetListenerAccessForUser() throws Exception { public void testSetListenerAccessForUser() throws Exception {
UserHandle user = UserHandle.of(10); UserHandle user = UserHandle.of(mContext.getUserId() + 10);
ComponentName c = ComponentName.unflattenFromString("package/Component"); ComponentName c = ComponentName.unflattenFromString("package/Component");
mBinderService.setNotificationListenerAccessGrantedForUser(c, user.getIdentifier(), true); mBinderService.setNotificationListenerAccessGrantedForUser(c, user.getIdentifier(), true);
@@ -2945,20 +2945,20 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
@Test @Test
public void testSetAssistantAccessForUser() throws Exception { public void testSetAssistantAccessForUser() throws Exception {
UserHandle user = UserHandle.of(10);
List<UserInfo> uis = new ArrayList<>();
UserInfo ui = new UserInfo(); UserInfo ui = new UserInfo();
ui.id = 10; ui.id = mContext.getUserId() + 10;
UserHandle user = UserHandle.of(ui.id);
List<UserInfo> uis = new ArrayList<>();
uis.add(ui); uis.add(ui);
ComponentName c = ComponentName.unflattenFromString("package/Component"); ComponentName c = ComponentName.unflattenFromString("package/Component");
when(mUm.getEnabledProfiles(10)).thenReturn(uis); when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis);
mBinderService.setNotificationAssistantAccessGrantedForUser(c, user.getIdentifier(), true); mBinderService.setNotificationAssistantAccessGrantedForUser(c, user.getIdentifier(), true);
verify(mContext, times(1)).sendBroadcastAsUser(any(), eq(user), any()); verify(mContext, times(1)).sendBroadcastAsUser(any(), eq(user), any());
verify(mAssistants, times(1)).setPackageOrComponentEnabled( verify(mAssistants, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), user.getIdentifier(), true, true); c.flattenToString(), user.getIdentifier(), true, true);
verify(mAssistants).setUserSet(10, true); verify(mAssistants).setUserSet(ui.id, true);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), user.getIdentifier(), false, true); c.flattenToString(), user.getIdentifier(), false, true);
verify(mListeners, never()).setPackageOrComponentEnabled( verify(mListeners, never()).setPackageOrComponentEnabled(
@@ -2967,7 +2967,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
@Test @Test
public void testGetAssistantAllowedForUser() throws Exception { public void testGetAssistantAllowedForUser() throws Exception {
UserHandle user = UserHandle.of(10); UserHandle user = UserHandle.of(mContext.getUserId() + 10);
try { try {
mBinderService.getAllowedNotificationAssistantForUser(user.getIdentifier()); mBinderService.getAllowedNotificationAssistantForUser(user.getIdentifier());
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
@@ -2987,12 +2987,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
throw e; throw e;
} }
} }
verify(mAssistants, times(1)).getAllowedComponents(0); verify(mAssistants, times(1)).getAllowedComponents(mContext.getUserId());
} }
@Test @Test
public void testSetDndAccessForUser() throws Exception { public void testSetDndAccessForUser() throws Exception {
UserHandle user = UserHandle.of(10); UserHandle user = UserHandle.of(mContext.getUserId() + 10);
ComponentName c = ComponentName.unflattenFromString("package/Component"); ComponentName c = ComponentName.unflattenFromString("package/Component");
mBinderService.setNotificationPolicyAccessGrantedForUser( mBinderService.setNotificationPolicyAccessGrantedForUser(
c.getPackageName(), user.getIdentifier(), true); c.getPackageName(), user.getIdentifier(), true);
@@ -3012,9 +3012,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
mBinderService.setNotificationListenerAccessGranted(c, true); mBinderService.setNotificationListenerAccessGranted(c, true);
verify(mListeners, times(1)).setPackageOrComponentEnabled( verify(mListeners, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, true, true); c.flattenToString(), mContext.getUserId(), true, true);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, false, true); c.flattenToString(), mContext.getUserId(), false, true);
verify(mAssistants, never()).setPackageOrComponentEnabled( verify(mAssistants, never()).setPackageOrComponentEnabled(
any(), anyInt(), anyBoolean(), anyBoolean()); any(), anyInt(), anyBoolean(), anyBoolean());
} }
@@ -3023,7 +3023,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
public void testSetAssistantAccess() throws Exception { public void testSetAssistantAccess() throws Exception {
List<UserInfo> uis = new ArrayList<>(); List<UserInfo> uis = new ArrayList<>();
UserInfo ui = new UserInfo(); UserInfo ui = new UserInfo();
ui.id = 0; ui.id = mContext.getUserId();
uis.add(ui); uis.add(ui);
when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis); when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis);
ComponentName c = ComponentName.unflattenFromString("package/Component"); ComponentName c = ComponentName.unflattenFromString("package/Component");
@@ -3031,9 +3031,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
mBinderService.setNotificationAssistantAccessGranted(c, true); mBinderService.setNotificationAssistantAccessGranted(c, true);
verify(mAssistants, times(1)).setPackageOrComponentEnabled( verify(mAssistants, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, true, true); c.flattenToString(), ui.id, true, true);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, false, true); c.flattenToString(), ui.id, false, true);
verify(mListeners, never()).setPackageOrComponentEnabled( verify(mListeners, never()).setPackageOrComponentEnabled(
any(), anyInt(), anyBoolean(), anyBoolean()); any(), anyInt(), anyBoolean(), anyBoolean());
} }
@@ -3042,10 +3042,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
public void testSetAssistantAccess_multiProfile() throws Exception { public void testSetAssistantAccess_multiProfile() throws Exception {
List<UserInfo> uis = new ArrayList<>(); List<UserInfo> uis = new ArrayList<>();
UserInfo ui = new UserInfo(); UserInfo ui = new UserInfo();
ui.id = 0; ui.id = mContext.getUserId();
uis.add(ui); uis.add(ui);
UserInfo ui10 = new UserInfo(); UserInfo ui10 = new UserInfo();
ui10.id = 10; ui10.id = mContext.getUserId() + 10;
uis.add(ui10); uis.add(ui10);
when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis); when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis);
ComponentName c = ComponentName.unflattenFromString("package/Component"); ComponentName c = ComponentName.unflattenFromString("package/Component");
@@ -3053,13 +3053,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
mBinderService.setNotificationAssistantAccessGranted(c, true); mBinderService.setNotificationAssistantAccessGranted(c, true);
verify(mAssistants, times(1)).setPackageOrComponentEnabled( verify(mAssistants, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, true, true); c.flattenToString(), ui.id, true, true);
verify(mAssistants, times(1)).setPackageOrComponentEnabled( verify(mAssistants, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 10, true, true); c.flattenToString(), ui10.id, true, true);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, false, true); c.flattenToString(), ui.id, false, true);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 10, false, true); c.flattenToString(), ui10.id, false, true);
verify(mListeners, never()).setPackageOrComponentEnabled( verify(mListeners, never()).setPackageOrComponentEnabled(
any(), anyInt(), anyBoolean(), anyBoolean()); any(), anyInt(), anyBoolean(), anyBoolean());
} }
@@ -3072,16 +3072,16 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
when(mAssistants.getAllowedComponents(anyInt())).thenReturn(componentList); when(mAssistants.getAllowedComponents(anyInt())).thenReturn(componentList);
List<UserInfo> uis = new ArrayList<>(); List<UserInfo> uis = new ArrayList<>();
UserInfo ui = new UserInfo(); UserInfo ui = new UserInfo();
ui.id = 0; ui.id = mContext.getUserId();
uis.add(ui); uis.add(ui);
when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis); when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis);
mBinderService.setNotificationAssistantAccessGranted(null, true); mBinderService.setNotificationAssistantAccessGranted(null, true);
verify(mAssistants, times(1)).setPackageOrComponentEnabled( verify(mAssistants, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, true, false); c.flattenToString(), ui.id, true, false);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, false, false); c.flattenToString(), ui.id, false, false);
verify(mListeners, never()).setPackageOrComponentEnabled( verify(mListeners, never()).setPackageOrComponentEnabled(
any(), anyInt(), anyBoolean(), anyBoolean()); any(), anyInt(), anyBoolean(), anyBoolean());
} }
@@ -3090,21 +3090,21 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
public void testSetAssistantAccessForUser_nullWithAllowedAssistant() throws Exception { public void testSetAssistantAccessForUser_nullWithAllowedAssistant() throws Exception {
List<UserInfo> uis = new ArrayList<>(); List<UserInfo> uis = new ArrayList<>();
UserInfo ui = new UserInfo(); UserInfo ui = new UserInfo();
ui.id = 10; ui.id = mContext.getUserId() + 10;
uis.add(ui); uis.add(ui);
UserHandle user = ui.getUserHandle(); UserHandle user = ui.getUserHandle();
ArrayList<ComponentName> componentList = new ArrayList<>(); ArrayList<ComponentName> componentList = new ArrayList<>();
ComponentName c = ComponentName.unflattenFromString("package/Component"); ComponentName c = ComponentName.unflattenFromString("package/Component");
componentList.add(c); componentList.add(c);
when(mAssistants.getAllowedComponents(anyInt())).thenReturn(componentList); when(mAssistants.getAllowedComponents(anyInt())).thenReturn(componentList);
when(mUm.getEnabledProfiles(10)).thenReturn(uis); when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis);
mBinderService.setNotificationAssistantAccessGrantedForUser( mBinderService.setNotificationAssistantAccessGrantedForUser(
null, user.getIdentifier(), true); null, user.getIdentifier(), true);
verify(mAssistants, times(1)).setPackageOrComponentEnabled( verify(mAssistants, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), user.getIdentifier(), true, false); c.flattenToString(), user.getIdentifier(), true, false);
verify(mAssistants).setUserSet(10, true); verify(mAssistants).setUserSet(ui.id, true);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), user.getIdentifier(), false, false); c.flattenToString(), user.getIdentifier(), false, false);
verify(mListeners, never()).setPackageOrComponentEnabled( verify(mListeners, never()).setPackageOrComponentEnabled(
@@ -3116,10 +3116,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
throws Exception { throws Exception {
List<UserInfo> uis = new ArrayList<>(); List<UserInfo> uis = new ArrayList<>();
UserInfo ui = new UserInfo(); UserInfo ui = new UserInfo();
ui.id = 0; ui.id = mContext.getUserId();
uis.add(ui); uis.add(ui);
UserInfo ui10 = new UserInfo(); UserInfo ui10 = new UserInfo();
ui10.id = 10; ui10.id = mContext.getUserId() + 10;
uis.add(ui10); uis.add(ui10);
UserHandle user = ui.getUserHandle(); UserHandle user = ui.getUserHandle();
ArrayList<ComponentName> componentList = new ArrayList<>(); ArrayList<ComponentName> componentList = new ArrayList<>();
@@ -3135,8 +3135,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
c.flattenToString(), user.getIdentifier(), true, false); c.flattenToString(), user.getIdentifier(), true, false);
verify(mAssistants, times(1)).setPackageOrComponentEnabled( verify(mAssistants, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), ui10.id, true, false); c.flattenToString(), ui10.id, true, false);
verify(mAssistants).setUserSet(0, true); verify(mAssistants).setUserSet(ui.id, true);
verify(mAssistants).setUserSet(10, true); verify(mAssistants).setUserSet(ui10.id, true);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), user.getIdentifier(), false, false); c.flattenToString(), user.getIdentifier(), false, false);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
@@ -3152,7 +3152,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
mBinderService.setNotificationPolicyAccessGranted(c.getPackageName(), true); mBinderService.setNotificationPolicyAccessGranted(c.getPackageName(), true);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.getPackageName(), 0, true, true); c.getPackageName(), mContext.getUserId(), true, true);
verify(mAssistants, never()).setPackageOrComponentEnabled( verify(mAssistants, never()).setPackageOrComponentEnabled(
any(), anyInt(), anyBoolean(), anyBoolean()); any(), anyInt(), anyBoolean(), anyBoolean());
verify(mListeners, never()).setPackageOrComponentEnabled( verify(mListeners, never()).setPackageOrComponentEnabled(
@@ -3179,7 +3179,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
ComponentName c = ComponentName.unflattenFromString("package/Component"); ComponentName c = ComponentName.unflattenFromString("package/Component");
List<UserInfo> uis = new ArrayList<>(); List<UserInfo> uis = new ArrayList<>();
UserInfo ui = new UserInfo(); UserInfo ui = new UserInfo();
ui.id = 0; ui.id = mContext.getUserId();
uis.add(ui); uis.add(ui);
when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis); when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis);
@@ -3214,9 +3214,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
mBinderService.setNotificationListenerAccessGranted(c, true); mBinderService.setNotificationListenerAccessGranted(c, true);
verify(mListeners, times(1)).setPackageOrComponentEnabled( verify(mListeners, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, true, true); c.flattenToString(), mContext.getUserId(), true, true);
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, false, true); c.flattenToString(), mContext.getUserId(), false, true);
verify(mAssistants, never()).setPackageOrComponentEnabled( verify(mAssistants, never()).setPackageOrComponentEnabled(
any(), anyInt(), anyBoolean(), anyBoolean()); any(), anyInt(), anyBoolean(), anyBoolean());
} }
@@ -3228,7 +3228,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
ComponentName c = ComponentName.unflattenFromString("package/Component"); ComponentName c = ComponentName.unflattenFromString("package/Component");
List<UserInfo> uis = new ArrayList<>(); List<UserInfo> uis = new ArrayList<>();
UserInfo ui = new UserInfo(); UserInfo ui = new UserInfo();
ui.id = 0; ui.id = mContext.getUserId();
uis.add(ui); uis.add(ui);
when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis); when(mUm.getEnabledProfiles(ui.id)).thenReturn(uis);
@@ -3237,9 +3237,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
verify(mListeners, never()).setPackageOrComponentEnabled( verify(mListeners, never()).setPackageOrComponentEnabled(
anyString(), anyInt(), anyBoolean(), anyBoolean()); anyString(), anyInt(), anyBoolean(), anyBoolean());
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, false, true); c.flattenToString(), ui.id, false, true);
verify(mAssistants, times(1)).setPackageOrComponentEnabled( verify(mAssistants, times(1)).setPackageOrComponentEnabled(
c.flattenToString(), 0, true, true); c.flattenToString(), ui.id, true, true);
} }
@Test @Test
@@ -3253,7 +3253,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
verify(mListeners, never()).setPackageOrComponentEnabled( verify(mListeners, never()).setPackageOrComponentEnabled(
anyString(), anyInt(), anyBoolean(), anyBoolean()); anyString(), anyInt(), anyBoolean(), anyBoolean());
verify(mConditionProviders, times(1)).setPackageOrComponentEnabled( verify(mConditionProviders, times(1)).setPackageOrComponentEnabled(
c.getPackageName(), 0, true, true); c.getPackageName(), mContext.getUserId(), true, true);
verify(mAssistants, never()).setPackageOrComponentEnabled( verify(mAssistants, never()).setPackageOrComponentEnabled(
any(), anyInt(), anyBoolean(), anyBoolean()); any(), anyInt(), anyBoolean(), anyBoolean());
} }