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

Commit 44d1c652 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Update redaction upon profile changes 

We can't rely on status bar state changes to update the notification
list. The current user might not be set yet, causing wrong notifications
to become visible.

Fixes: 145135488
Test: manual
Test: atest NotificationStackScrollLayoutTest
Change-Id: I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b
Merged-In: I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b
parent b5357be3

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+5 −2
Original line number Diff line number Diff line
@@ -566,6 +566,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        mRoundnessManager.setAnimatedChildren(mChildrenToAddAnimated);

        mRoundnessManager.setOnRoundingChangedCallback(this::invalidate);

        addOnExpandedHeightListener(mRoundnessManager::setExpanded);

        mLockscreenUserManager.addUserChangedListener(userId ->

                updateSensitiveness(false /* animated */));

        setOutlineProvider(mOutlineProvider);



        // Blocking helper manager wants to know the expanded state, update as well.
@@ -4567,7 +4569,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
    }



    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    private void setHideSensitive(boolean hideSensitive, boolean animate) {

    private void updateSensitiveness(boolean animate) {

        boolean hideSensitive = mLockscreenUserManager.isAnyProfilePublicMode();

        if (hideSensitive != mAmbientState.isHideSensitive()) {

            int childCount = getChildCount();

            for (int i = 0; i < childCount; i++) {
@@ -5331,7 +5334,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 


        SysuiStatusBarStateController state = (SysuiStatusBarStateController)

                Dependency.get(StatusBarStateController.class);

        setHideSensitive(publicMode, state.goingToFullShade() /* animate */);

        updateSensitiveness(state.goingToFullShade() /* animate */);

        setDimmed(onKeyguard, state.fromShadeLocked() /* animate */);

        setExpandingEnabled(!onKeyguard);

        ActivatableNotificationView activatedChild = getActivatedChild();

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

+16 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.AmbientPulseManager;

import com.android.systemui.statusbar.EmptyShadeView;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManager.UserChangedListener;

import com.android.systemui.statusbar.NotificationPresenter;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShelf;
@@ -117,6 +119,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Mock private NotificationIconAreaController mNotificationIconAreaController;

    @Mock private MetricsLogger mMetricsLogger;

    @Mock private NotificationRoundnessManager mNotificationRoundnessManager;

    @Mock private NotificationLockscreenUserManager mLockscreenUserManager;

    private UserChangedListener mUserChangedListener;

    private TestableNotificationEntryManager mEntryManager;

    private int mOriginalInterruptionModelSetting;
@@ -135,6 +139,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        mDependency.injectTestDependency(

                NotificationBlockingHelperManager.class,

                mBlockingHelperManager);

        mDependency.injectTestDependency(NotificationLockscreenUserManager.class,

                mLockscreenUserManager);

        mDependency.injectTestDependency(StatusBarStateController.class, mBarState);

        mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);

        mDependency.injectTestDependency(NotificationRemoteInputManager.class,
@@ -150,6 +156,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 




        NotificationShelf notificationShelf = mock(NotificationShelf.class);

        ArgumentCaptor<UserChangedListener> userChangedCaptor = ArgumentCaptor

                .forClass(UserChangedListener.class);



        // The actual class under test.  You may need to work with this class directly when

        // testing anonymous class members of mStackScroller, like mMenuEventListener,
@@ -171,6 +179,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        mStackScroller.setGroupManager(mGroupManager);

        mStackScroller.setEmptyShadeView(mEmptyShadeView);

        mStackScroller.setIconAreaController(mNotificationIconAreaController);

        verify(mLockscreenUserManager).addUserChangedListener(userChangedCaptor.capture());

        mUserChangedListener = userChangedCaptor.getValue();



        // Stub out functionality that isn't necessary to test.

        doNothing().when(mBar)
@@ -255,6 +265,12 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        verify(mBlockingHelperManager).setNotificationShadeExpanded(100f);

    }



    @Test

    public void testOnStatePostChange_verifyIfProfileIsPublic() {

        mUserChangedListener.onUserChanged(0);

        verify(mLockscreenUserManager).isAnyProfilePublicMode();

    }



    @Test

    public void manageNotifications_visible() {

        FooterView view = mock(FooterView.class);