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

Commit 7b9d3239 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Pre P apps can't change new fields" into pi-dev 

am: c11cb1b1

Change-Id: I9f09a5932de931dc8e7414f9dcd57b89a121d82c
parents e10415df c11cb1b1

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

+0 −1
Original line number Diff line number Diff line
@@ -1883,7 +1883,6 @@ public class NotificationManagerService extends SystemService { 
            if ((newSuppressedVisualEffects & SUPPRESSED_EFFECT_SCREEN_OFF) != 0) {

                newSuppressedVisualEffects |= SUPPRESSED_EFFECT_LIGHTS;

                newSuppressedVisualEffects |= SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;

                newSuppressedVisualEffects |= SUPPRESSED_EFFECT_AMBIENT;

            }

            if ((newSuppressedVisualEffects & SUPPRESSED_EFFECT_SCREEN_ON) != 0) {

                newSuppressedVisualEffects |= SUPPRESSED_EFFECT_PEEK;

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

+2 −2
Original line number Diff line number Diff line
@@ -2558,8 +2558,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 


        int expected = SUPPRESSED_EFFECT_BADGE

                | SUPPRESSED_EFFECT_SCREEN_ON | SUPPRESSED_EFFECT_SCREEN_OFF

                | SUPPRESSED_EFFECT_PEEK | SUPPRESSED_EFFECT_AMBIENT

                | SUPPRESSED_EFFECT_LIGHTS | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;

                | SUPPRESSED_EFFECT_PEEK | SUPPRESSED_EFFECT_LIGHTS

                | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;

        int actual = mService.calculateSuppressedVisualEffects(appPolicy, userPolicy, O_MR1);



        assertEquals(expected, actual);