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

Commit 933f92ea authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Enable DynamicPrivacy whenever notifications are visible." into tm-qpr-dev am: fd4f5f10 

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



Change-Id: I55cf004bdc5840ccc8b7555097dec5ae97b6546f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 625ea933 fd4f5f10

packages/SystemUI/src/com/android/systemui/statusbar/notification/DynamicPrivacyController.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class DynamicPrivacyController implements KeyguardStateController.Callbac 


    @VisibleForTesting

    boolean isDynamicPrivacyEnabled() {

        return !mLockscreenUserManager.userAllowsPrivateNotificationsInPublic(

        return mLockscreenUserManager.userAllowsNotificationsInPublic(

                mLockscreenUserManager.getCurrentUserId());

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/DynamicPrivacyControllerTest.java

+9 −12
Original line number Diff line number Diff line
@@ -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