Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab2a4e1c authored by Felipe Leme's avatar Felipe Leme Committed by Automerger Merge Worker
Browse files

Merge "Added more test cases on NotificationManagerServiceTest" into udc-dev am: 5998d94e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22236205



Change-Id: I3428f3d890e6fa93000569e8e3781186a4b38dc9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25c2d8d9 5998d94e

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -3328,10 +3328,10 @@ public class NotificationManagerService extends SystemService { 
            }















            if (!isUiContext && displayId == Display.DEFAULT_DISPLAY













                    && UserManager.isVisibleBackgroundUsersEnabled()) {













                // When the caller is a visible background user using a non-ui context (like the













                    && mUm.isVisibleBackgroundUsersSupported()) {













                // When the caller is a visible background user using a non-UI context (like the















                // application context), the Toast must be displayed in the display the user was













                // started visible on













                // started visible on.















                int userId = UserHandle.getUserId(callingUid);















                int userDisplayId = mUmInternal.getMainDisplayAssignedToUser(userId);















                if (displayId != userDisplayId) {

































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



+159
−62


























File changed.
Preview size limit exceeded, changes collapsed.