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

Commit f920836f authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Inject EventLog into NotificationInterruptStateProviderImpl 

Bug: 261728888
Test: atest NotificationInterruptStateProviderImplTest
Test: atest NotificationInterruptStateProviderWrapperTest
Test: atest VisualInterruptionDecisionProviderImplTest
Flag: ACONFIG com.android.systemui.visual_interruptions_refactor DEVELOPMENT
Change-Id: Ifb08e85780789da794bdfebc705a329ec710ced3
parent cf6278cb

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java

+8 −4
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.systemui.statusbar.policy.BatteryController; 
import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.HeadsUpManager;

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

import com.android.systemui.util.EventLog;

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

import com.android.systemui.util.time.SystemClock;
@@ -81,6 +82,7 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
    private final DeviceProvisionedController mDeviceProvisionedController;

    private final SystemClock mSystemClock;

    private final GlobalSettings mGlobalSettings;

    private final EventLog mEventLog;



    @VisibleForTesting

    protected boolean mUseHeadsUp = false;
@@ -129,7 +131,8 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
            UserTracker userTracker,

            DeviceProvisionedController deviceProvisionedController,

            SystemClock systemClock,

            GlobalSettings globalSettings) {

            GlobalSettings globalSettings,

            EventLog eventLog) {

        mPowerManager = powerManager;

        mBatteryController = batteryController;

        mAmbientDisplayConfiguration = ambientDisplayConfiguration;
@@ -144,6 +147,7 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
        mDeviceProvisionedController = deviceProvisionedController;

        mSystemClock = systemClock;

        mGlobalSettings = globalSettings;

        mEventLog = eventLog;

        ContentObserver headsUpObserver = new ContentObserver(mainHandler) {

            @Override

            public void onChange(boolean selfChange) {
@@ -369,7 +373,7 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
                // explicitly prevent logging for this (frequent) case

                return;

            case NO_FSI_SUPPRESSIVE_GROUP_ALERT_BEHAVIOR:

                android.util.EventLog.writeEvent(0x534e4554, "231322873", uid,

                mEventLog.writeEvent(0x534e4554, "231322873", uid,

                        "groupAlertBehavior");

                mUiEventLogger.log(FSI_SUPPRESSED_SUPPRESSIVE_GROUP_ALERT_BEHAVIOR, uid,

                        packageName);
@@ -377,7 +381,7 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
                        decision + ": GroupAlertBehavior will prevent HUN");

                return;

            case NO_FSI_SUPPRESSIVE_BUBBLE_METADATA:

                android.util.EventLog.writeEvent(0x534e4554, "274759612", uid,

                mEventLog.writeEvent(0x534e4554, "274759612", uid,

                        "bubbleMetadata");

                mUiEventLogger.log(FSI_SUPPRESSED_SUPPRESSIVE_BUBBLE_METADATA, uid,

                        packageName);
@@ -385,7 +389,7 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
                        decision + ": BubbleMetadata may prevent HUN");

                return;

            case NO_FSI_NO_HUN_OR_KEYGUARD:

                android.util.EventLog.writeEvent(0x534e4554, "231322873", uid,

                mEventLog.writeEvent(0x534e4554, "231322873", uid,

                        "no hun or keyguard");

                mUiEventLogger.log(FSI_SUPPRESSED_NO_HUN_OR_KEYGUARD, uid, packageName);

                mLogger.logNoFullscreenWarning(entry,

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

+5 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import com.android.systemui.statusbar.policy.BatteryController; 
import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.HeadsUpManager;

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

import com.android.systemui.util.FakeEventLog;

import com.android.systemui.util.settings.FakeGlobalSettings;

import com.android.systemui.util.time.FakeSystemClock;
@@ -126,6 +127,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
    DeviceProvisionedController mDeviceProvisionedController;

    FakeSystemClock mSystemClock;

    FakeGlobalSettings mGlobalSettings;

    FakeEventLog mEventLog;



    private NotificationInterruptStateProviderImpl mNotifInterruptionStateProvider;
@@ -138,6 +140,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        mSystemClock = new FakeSystemClock();

        mGlobalSettings = new FakeGlobalSettings();

        mGlobalSettings.putInt(HEADS_UP_NOTIFICATIONS_ENABLED, HEADS_UP_ON);

        mEventLog = new FakeEventLog();



        mNotifInterruptionStateProvider =

                new NotificationInterruptStateProviderImpl(
@@ -155,7 +158,8 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
                        mUserTracker,

                        mDeviceProvisionedController,

                        mSystemClock,

                        mGlobalSettings);

                        mGlobalSettings,

                        mEventLog);

        mNotifInterruptionStateProvider.mUseHeadsUp = true;

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ class NotificationInterruptStateProviderWrapperTest : VisualInterruptionDecision 
                deviceProvisionedController,

                systemClock,

                globalSettings,

                eventLog

            )

        )

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntryB 
import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderImpl.MAX_HUN_WHEN_AGE_MS

import com.android.systemui.statusbar.policy.FakeDeviceProvisionedController

import com.android.systemui.statusbar.policy.HeadsUpManager

import com.android.systemui.util.FakeEventLog

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.settings.FakeGlobalSettings
@@ -100,6 +101,7 @@ abstract class VisualInterruptionDecisionProviderTestBase : SysuiTestCase() { 
    protected val ambientDisplayConfiguration = FakeAmbientDisplayConfiguration(context)

    protected val batteryController = FakeBatteryController(leakCheck)

    protected val deviceProvisionedController = FakeDeviceProvisionedController()

    protected val eventLog = FakeEventLog()

    protected val flags: NotifPipelineFlags = mock()

    protected val globalSettings =

        FakeGlobalSettings().also { it.putInt(HEADS_UP_NOTIFICATIONS_ENABLED, HEADS_UP_ON) }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+9 −3
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ import com.android.systemui.statusbar.policy.UserInfoControllerImpl; 
import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.statusbar.window.StatusBarWindowController;

import com.android.systemui.statusbar.window.StatusBarWindowStateController;

import com.android.systemui.util.EventLog;

import com.android.systemui.util.FakeEventLog;

import com.android.systemui.util.WallpaperController;

import com.android.systemui.util.concurrency.FakeExecutor;

import com.android.systemui.util.concurrency.MessageRouterImpl;
@@ -324,6 +326,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
    private ShadeController mShadeController;

    private final FakeSystemClock mFakeSystemClock = new FakeSystemClock();

    private final FakeGlobalSettings mFakeGlobalSettings = new FakeGlobalSettings();

    private final FakeEventLog mFakeEventLog = new FakeEventLog();

    private final FakeExecutor mMainExecutor = new FakeExecutor(mFakeSystemClock);

    private final FakeExecutor mUiBgExecutor = new FakeExecutor(mFakeSystemClock);

    private final FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags();
@@ -374,7 +377,8 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
                        mUserTracker,

                        mDeviceProvisionedController,

                        mFakeSystemClock,

                        mFakeGlobalSettings);

                        mFakeGlobalSettings,

                        mFakeEventLog);



        mContext.addMockSystemService(TrustManager.class, mock(TrustManager.class));

        mContext.addMockSystemService(FingerprintManager.class, mock(FingerprintManager.class));
@@ -1187,7 +1191,8 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
                UserTracker userTracker,

                DeviceProvisionedController deviceProvisionedController,

                SystemClock systemClock,

                GlobalSettings globalSettings) {

                GlobalSettings globalSettings,

                EventLog eventLog) {

            super(

                    powerManager,

                    ambientDisplayConfiguration,
@@ -1203,7 +1208,8 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
                    userTracker,

                    deviceProvisionedController,

                    systemClock,

                    globalSettings

                    globalSettings,

                    eventLog

            );

            mUseHeadsUp = true;

        }