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

Commit 6129cfa7 authored by Jan Tomljanovic's avatar Jan Tomljanovic
Browse files

Fix the bug where inner lock in MultiRateLimiter is null. 

The bug would occur when Mockito stopped mocking methods when the test
is done, but the mocked object still exists, and is then accessed as a
scheduled message triggers it.

Test: atest NotificationManagerServiceTest
Bug: 174997218
Change-Id: I3c76456927bb0c27945b137187011b5eb3c7102c
parent 7bd311cf

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+13 −8
Original line number Diff line number Diff line
@@ -305,6 +305,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
    @Mock

    StatusBarManagerInternal mStatusBar;



    private NotificationManagerService.WorkerHandler mWorkerHandler;



    // Use a Testable subclass so we can simulate calls from the system without failing.

    private static class TestableNotificationManagerService extends NotificationManagerService {

        int countSystemChecks = 0;
@@ -482,14 +484,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 


        when(mAssistants.isAdjustmentAllowed(anyString())).thenReturn(true);



        mService.init(mService.new WorkerHandler(mTestableLooper.getLooper()),

                mRankingHandler, mPackageManager, mPackageManagerClient, mockLightsManager,

                mListeners, mAssistants, mConditionProviders,

                mCompanionMgr, mSnoozeHelper, mUsageStats, mPolicyFile, mActivityManager,

                mGroupHelper, mAm, mAtm, mAppUsageStats,

                mock(DevicePolicyManagerInternal.class), mUgm, mUgmInternal,

                mAppOpsManager, mUm, mHistoryManager, mStatsManager,

                mock(TelephonyManager.class), mAmi, mToastRateLimiter);

        mWorkerHandler = mService.new WorkerHandler(mTestableLooper.getLooper());

        mService.init(mWorkerHandler, mRankingHandler, mPackageManager, mPackageManagerClient,

                mockLightsManager, mListeners, mAssistants, mConditionProviders, mCompanionMgr,

                mSnoozeHelper, mUsageStats, mPolicyFile, mActivityManager, mGroupHelper, mAm, mAtm,

                mAppUsageStats, mock(DevicePolicyManagerInternal.class), mUgm, mUgmInternal,

                mAppOpsManager, mUm, mHistoryManager, mStatsManager, mock(TelephonyManager.class),

                mAmi, mToastRateLimiter);

        mService.onBootPhase(SystemService.PHASE_SYSTEM_SERVICES_READY);



        mService.setAudioManager(mAudioManager);
@@ -575,6 +576,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 


        InstrumentationRegistry.getInstrumentation()

                .getUiAutomation().dropShellPermissionIdentity();

        // Remove scheduled messages that would be processed when the test is already done, and

        // could cause issues, for example, messages that remove/cancel shown toasts (this causes

        // problematic interactions with mocks when they're no longer working as expected).

        mWorkerHandler.removeCallbacksAndMessages(null);

    }



    private void simulatePackageSuspendBroadcast(boolean suspend, String pkg,