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

Commit ce87b15b authored by Steve Elliott's avatar Steve Elliott Committed by Automerger Merge Worker
Browse files

Merge "Add logging to KeyguardNotifVisProvider" into tm-dev am: 5060905a 

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



Change-Id: I32da200de74d5f7c5158c5a446781f0da69db46f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ecafadd 5060905a

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ public class KeyguardCoordinator implements Coordinator { 
    private final HighPriorityProvider mHighPriorityProvider;

    private final HighPriorityProvider mHighPriorityProvider;

    private final SectionHeaderVisibilityProvider mSectionHeaderVisibilityProvider;

    private final SectionHeaderVisibilityProvider mSectionHeaderVisibilityProvider;

    private final KeyguardNotificationVisibilityProvider mKeyguardNotificationVisibilityProvider;

    private final KeyguardNotificationVisibilityProvider mKeyguardNotificationVisibilityProvider;

    private final SharedCoordinatorLogger mLogger;





    @Inject

    @Inject

    public KeyguardCoordinator(

    public KeyguardCoordinator(
@@ -48,12 +49,14 @@ public class KeyguardCoordinator implements Coordinator { 
            KeyguardUpdateMonitor keyguardUpdateMonitor,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            HighPriorityProvider highPriorityProvider,

            HighPriorityProvider highPriorityProvider,

            SectionHeaderVisibilityProvider sectionHeaderVisibilityProvider,

            SectionHeaderVisibilityProvider sectionHeaderVisibilityProvider,

            KeyguardNotificationVisibilityProvider keyguardNotificationVisibilityProvider) {

            KeyguardNotificationVisibilityProvider keyguardNotificationVisibilityProvider,

            SharedCoordinatorLogger logger) {

        mStatusBarStateController = statusBarStateController;

        mStatusBarStateController = statusBarStateController;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mHighPriorityProvider = highPriorityProvider;

        mHighPriorityProvider = highPriorityProvider;

        mSectionHeaderVisibilityProvider = sectionHeaderVisibilityProvider;

        mSectionHeaderVisibilityProvider = sectionHeaderVisibilityProvider;

        mKeyguardNotificationVisibilityProvider = keyguardNotificationVisibilityProvider;

        mKeyguardNotificationVisibilityProvider = keyguardNotificationVisibilityProvider;

        mLogger = logger;

    }

    }





    @Override

    @Override
@@ -81,6 +84,7 @@ public class KeyguardCoordinator implements Coordinator { 
    }

    }





    private void invalidateListFromFilter(String reason) {

    private void invalidateListFromFilter(String reason) {

        mLogger.logKeyguardCoordinatorInvalidated(reason);

        updateSectionHeadersVisibility();

        updateSectionHeadersVisibility();

        mNotifFilter.invalidateList();

        mNotifFilter.invalidateList();

    }

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SharedCoordinatorLogger.kt

+8 −0
Original line number Original line Diff line number Diff line
@@ -35,4 +35,12 @@ class SharedCoordinatorLogger @Inject constructor( 
            "Current user or profiles changed. Current user is $int1; profiles are $str1"

            "Current user or profiles changed. Current user is $int1; profiles are $str1"

        })

        })

    }

    }



    fun logKeyguardCoordinatorInvalidated(reason: String) {

        buffer.log("KeyguardCoordinator", LogLevel.DEBUG, {

            str1 = reason

        }, {

            "KeyguardCoordinator invalidated: $str1"

        })

    }

}
 
}

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/KeyguardNotificationVisibilityProvider.kt

+13 −0
Original line number Original line Diff line number Diff line
@@ -25,12 +25,15 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry 
import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider

import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.util.ListenerSet

import com.android.systemui.util.ListenerSet

import com.android.systemui.util.asIndenting

import com.android.systemui.util.settings.GlobalSettings

import com.android.systemui.util.settings.GlobalSettings

import com.android.systemui.util.settings.SecureSettings

import com.android.systemui.util.settings.SecureSettings

import com.android.systemui.util.withIncreasedIndent

import dagger.Binds

import dagger.Binds

import dagger.Module

import dagger.Module

import dagger.multibindings.ClassKey

import dagger.multibindings.ClassKey

import dagger.multibindings.IntoMap

import dagger.multibindings.IntoMap

import java.io.PrintWriter

import java.util.function.Consumer

import java.util.function.Consumer

import javax.inject.Inject

import javax.inject.Inject
@@ -209,6 +212,16 @@ private class KeyguardNotificationVisibilityProviderImpl @Inject constructor( 
        }

        }

    }

    }





    override fun dump(pw: PrintWriter, args: Array<out String>) = pw.asIndenting().run {

        println("isLockedOrLocking=$isLockedOrLocking")

        withIncreasedIndent {

            println("keyguardStateController.isShowing=${keyguardStateController.isShowing}")

            println("statusBarStateController.currentOrUpcomingState=" +

                    "${statusBarStateController.currentOrUpcomingState}")

        }

        println("hideSilentNotificationsOnLockscreen=$hideSilentNotificationsOnLockscreen")

    }



    private val isLockedOrLocking get() =

    private val isLockedOrLocking get() =

        keyguardStateController.isShowing ||

        keyguardStateController.isShowing ||

                statusBarStateController.currentOrUpcomingState == StatusBarState.KEYGUARD

                statusBarStateController.currentOrUpcomingState == StatusBarState.KEYGUARD

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.systemui.statusbar.notification.collection.coordinator;

package com.android.systemui.statusbar.notification.collection.coordinator;





import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;
@@ -74,7 +75,7 @@ public class KeyguardCoordinatorTest extends SysuiTestCase { 
        KeyguardCoordinator keyguardCoordinator = new KeyguardCoordinator(

        KeyguardCoordinator keyguardCoordinator = new KeyguardCoordinator(

                mStatusBarStateController,

                mStatusBarStateController,

                mKeyguardUpdateMonitor, mHighPriorityProvider, mSectionHeaderVisibilityProvider,

                mKeyguardUpdateMonitor, mHighPriorityProvider, mSectionHeaderVisibilityProvider,

                mKeyguardNotificationVisibilityProvider);

                mKeyguardNotificationVisibilityProvider, mock(SharedCoordinatorLogger.class));





        mEntry = new NotificationEntryBuilder()

        mEntry = new NotificationEntryBuilder()

                .setUser(new UserHandle(NOTIF_USER_ID))

                .setUser(new UserHandle(NOTIF_USER_ID))