From eac2da20b0ff67ae7c52f815090a982f0544e1c4 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Thu, 12 Apr 2018 10:48:46 -0400 Subject: [PATCH] Pre P apps can't change new fields Screen off means fullscreen intents, lights, and ambient in P but pre-P mean only lights and full screen intents. Test: runtest systemui-notification, cts Change-Id: I83857b5df2f669751df34d58aa645f4102b8e0e4 Fixes: 77470790 --- .../server/notification/NotificationManagerService.java | 1 - .../server/notification/NotificationManagerServiceTest.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 2c0f469430410..55f51c2657756 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -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; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index 124cb426db191..14f84b1feca22 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -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);