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

Merge "Reduce unnecessary NotificationListener binder transaction." am: d3ec7950e3

Browse Source 
am: c3918379eb

Change-Id: I3270a2dcc3a41a46c74bfbb4e636da1264b6c5cd
This commit is contained in:
Julia Reynolds
2019-10-04 07:12:00 -07:00
committed by android-build-merger
parent b43f746cdc c3918379eb
commit 3797fd2b58
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/notification/NotificationManagerService.java Normal file → Executable file
View File

@@ -1274,16 +1274,15 @@ public class NotificationManagerService extends SystemService {
uidList = new int[] {intent.getIntExtra(Intent.EXTRA_UID, -1)};
}
if (pkgList != null && (pkgList.length > 0)) {
for (String pkgName : pkgList) {
if (cancelNotifications) {
if (cancelNotifications) {
for (String pkgName : pkgList) {
cancelAllNotificationsInt(MY_UID, MY_PID, pkgName, null, 0, 0,
!queryRestart, changeUserId, reason, null);
} else if (hideNotifications) {
hideNotificationsForPackages(pkgList);
} else if (unhideNotifications) {
unhideNotificationsForPackages(pkgList);
}
} else if (hideNotifications) {
hideNotificationsForPackages(pkgList);
} else if (unhideNotifications) {
unhideNotificationsForPackages(pkgList);
}
}

8
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java Normal file → Executable file
View File

@@ -3601,7 +3601,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
mService.simulatePackageDistractionBroadcast(
PackageManager.RESTRICTION_HIDE_NOTIFICATIONS, new String[] {"a", "b"});
ArgumentCaptor<List<NotificationRecord>> captorHide = ArgumentCaptor.forClass(List.class);
verify(mListeners, times(2)).notifyHiddenLocked(captorHide.capture());
// should be called only once.
verify(mListeners, times(1)).notifyHiddenLocked(captorHide.capture());
assertEquals(2, captorHide.getValue().size());
assertEquals("a", captorHide.getValue().get(0).sbn.getPackageName());
assertEquals("b", captorHide.getValue().get(1).sbn.getPackageName());
@@ -3610,7 +3612,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
mService.simulatePackageDistractionBroadcast(
PackageManager.RESTRICTION_HIDE_FROM_SUGGESTIONS, new String[] {"a", "b"});
ArgumentCaptor<List<NotificationRecord>> captorUnhide = ArgumentCaptor.forClass(List.class);
verify(mListeners, times(2)).notifyUnhiddenLocked(captorUnhide.capture());
// should be called only once.
verify(mListeners, times(1)).notifyUnhiddenLocked(captorUnhide.capture());
assertEquals(2, captorUnhide.getValue().size());
assertEquals("a", captorUnhide.getValue().get(0).sbn.getPackageName());
assertEquals("b", captorUnhide.getValue().get(1).sbn.getPackageName());