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

Commit c7937c13 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW... 

Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW notifications." into oc-dr1-dev
parents 8e8debbe 8ce1be42

services/core/java/com/android/server/notification/NotificationManagerService.java

+13 −8
Original line number Diff line number Diff line
@@ -3741,13 +3741,16 @@ public class NotificationManagerService extends SystemService { 
        boolean hasValidVibrate = false;

        boolean hasValidSound = false;



        if (aboveThreshold && isNotificationForCurrentUser(record)) {

            // If the notification will appear in the status bar, it should send an accessibility

            // event

            if (!record.isUpdate && record.getImportance() > IMPORTANCE_MIN) {

        if (isNotificationForCurrentUser(record)) {

            // If the notification icon will appear in the status bar, AND it hasn't been blocked

            // by do-not-disturb, it should generate an accessibility event

            if (!record.isUpdate

                    && !record.isIntercepted()

                    && record.getImportance() > IMPORTANCE_MIN) {

                sendAccessibilityEvent(notification, record.sbn.getPackageName());

            }

            if (mSystemReady && mAudioManager != null) {

            if (aboveThreshold && mSystemReady && mAudioManager != null) {

                // this notification wants to make noise & is allowed to make noise

                Uri soundUri = record.getSound();

                hasValidSound = soundUri != null && !Uri.EMPTY.equals(soundUri);
@@ -4261,9 +4264,11 @@ public class NotificationManagerService extends SystemService { 
        return (x < low) ? low : ((x > high) ? high : x);

    }



    @VisibleForTesting

    void sendAccessibilityEvent(Notification notification, CharSequence packageName) {

        AccessibilityManager manager = AccessibilityManager.getInstance(getContext());

        if (!manager.isEnabled()) {

        final AccessibilityManager accessibilityManager

                = AccessibilityManager.getInstance(getContext());

        if (accessibilityManager == null || !accessibilityManager.isEnabled()) {

            return;

        }
@@ -4277,7 +4282,7 @@ public class NotificationManagerService extends SystemService { 
            event.getText().add(tickerText);

        }



        manager.sendAccessibilityEvent(event);

        accessibilityManager.sendAccessibilityEvent(event);

    }



    /**

services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java

+28 −9
Original line number Diff line number Diff line
@@ -30,12 +30,7 @@ import static org.mockito.Matchers.anyObject; 
import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.argThat;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.*;



import android.app.ActivityManager;

import android.app.Notification;
@@ -57,6 +52,8 @@ import android.provider.Settings; 
import android.service.notification.StatusBarNotification;

import android.support.test.runner.AndroidJUnit4;

import android.test.suitebuilder.annotation.SmallTest;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityManager;



import com.android.server.lights.Light;
@@ -77,8 +74,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 
    @Mock android.media.IRingtonePlayer mRingtonePlayer;

    @Mock Light mLight;

    @Mock Handler mHandler;

    @Mock

    NotificationUsageStats mUsageStats;

    @Mock NotificationUsageStats mUsageStats;



    private NotificationManagerService mService;

    private String mPkg = "com.android.server.notification";
@@ -111,6 +107,9 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 


    @Before

    public void setUp() {

        // Magic to allow spying package-private methods on system classes

        System.setProperty("dexmaker.share_classloader", "true");



        MockitoAnnotations.initMocks(this);



        when(mAudioManager.isAudioFocusExclusive()).thenReturn(false);
@@ -120,7 +119,8 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 


        when(mUsageStats.isAlertRateLimited(any())).thenReturn(false);



        mService = new NotificationManagerService(getContext());

        mService = spy(new NotificationManagerService(getContext()));

        doNothing().when(mService).sendAccessibilityEvent((Notification) any(), anyString());

        mService.setAudioManager(mAudioManager);

        mService.setVibrator(mVibrator);

        mService.setSystemReady(true);
@@ -358,6 +358,16 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 
                eq(CUSTOM_LIGHT_COLOR), anyInt(), eq(CUSTOM_LIGHT_ON), eq(CUSTOM_LIGHT_OFF));

    }



    private void verifySendAccessibilityEvent() {

        verify(mService, times(1))

                .sendAccessibilityEvent((Notification) anyObject(), anyString());

    }



    private void verifyNoAccessibilityEvent() {

        verify(mService, never())

                .sendAccessibilityEvent((Notification) anyObject(), anyString());

    }



    //

    // Tests

    //
@@ -380,6 +390,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 


        verifyBeepLooped();

        verifyNeverVibrate();

        verifySendAccessibilityEvent();

    }



    @Test
@@ -389,6 +400,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 
        mService.buzzBeepBlinkLocked(r);



        verifyBeep();

        verifySendAccessibilityEvent();

    }



    @Test
@@ -409,6 +421,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 


        verifyNeverBeep();

        verifyNeverVibrate();

        verifyNoAccessibilityEvent();

    }



    @Test
@@ -420,6 +433,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 


        verifyNeverBeep();

        verifyNeverVibrate();

        verifyNoAccessibilityEvent();

    }



    @Test
@@ -445,10 +459,12 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 
        // set up internal state

        mService.buzzBeepBlinkLocked(r);

        Mockito.reset(mRingtonePlayer);

        Mockito.reset(mService);



        // update should not beep

        mService.buzzBeepBlinkLocked(s);

        verifyNeverBeep();

        verifyNoAccessibilityEvent();

    }



    @Test
@@ -591,6 +607,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 


        verifyNeverBeep();

        verifyVibrate();

        verifySendAccessibilityEvent();

    }



    @Test
@@ -689,10 +706,12 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { 
        // set up internal state

        mService.buzzBeepBlinkLocked(r);

        Mockito.reset(mVibrator);

        Mockito.reset(mService);



        // update should not beep

        mService.buzzBeepBlinkLocked(s);

        verifyNeverVibrate();

        verifyNoAccessibilityEvent();

    }



    @Test