diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/DynamicPrivacyController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/DynamicPrivacyController.java index a0ccd5726c755..1be4c04ef8047 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/DynamicPrivacyController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/DynamicPrivacyController.java @@ -80,7 +80,7 @@ public class DynamicPrivacyController implements KeyguardStateController.Callbac @VisibleForTesting boolean isDynamicPrivacyEnabled() { - return !mLockscreenUserManager.userAllowsPrivateNotificationsInPublic( + return mLockscreenUserManager.userAllowsNotificationsInPublic( mLockscreenUserManager.getCurrentUserId()); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/DynamicPrivacyControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/DynamicPrivacyControllerTest.java index 7d06abf5cd671..3fc0c8176f2f1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/DynamicPrivacyControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/DynamicPrivacyControllerTest.java @@ -63,7 +63,7 @@ public class DynamicPrivacyControllerTest extends SysuiTestCase { mock(StatusBarKeyguardViewManager.class)); mDynamicPrivacyController.addListener(mListener); // Disable dynamic privacy by default - allowPrivateNotificationsInPublic(true); + allowNotificationsInPublic(false); } @Test @@ -108,24 +108,21 @@ public class DynamicPrivacyControllerTest extends SysuiTestCase { @Test public void dynamicPrivacyOnlyWhenHidingPrivate() { - // Verify that when only hiding notifications, this isn't enabled - allowPrivateNotificationsInPublic(true); - when(mLockScreenUserManager.shouldHideNotifications(any())).thenReturn( - false); - assertFalse("Dynamic privacy shouldn't be enabled when only hiding notifications", + // Verify that when hiding notifications, this isn't enabled + allowNotificationsInPublic(false); + assertFalse("Dynamic privacy shouldn't be enabled when hiding notifications", mDynamicPrivacyController.isDynamicPrivacyEnabled()); - allowPrivateNotificationsInPublic(false); - assertTrue("Should be enabled when hiding notification contents", + allowNotificationsInPublic(true); + assertTrue("Should be enabled whenever notifications are visible", mDynamicPrivacyController.isDynamicPrivacyEnabled()); } private void enableDynamicPrivacy() { - allowPrivateNotificationsInPublic(false); + allowNotificationsInPublic(true); } - private void allowPrivateNotificationsInPublic(boolean allow) { - when(mLockScreenUserManager.userAllowsPrivateNotificationsInPublic(anyInt())).thenReturn( - allow); + private void allowNotificationsInPublic(boolean allow) { + when(mLockScreenUserManager.userAllowsNotificationsInPublic(anyInt())).thenReturn(allow); } @Test