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

Commit 1999c8a5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't attach private Notification to A11yEvent when user locked" into... 

Merge "Don't attach private Notification to A11yEvent when user locked" into sc-dev am: 1b1df331 am: e03cc1b4

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

Change-Id: Ia3e48a1853c9d4e0aa7d95fb3de5a8a544a8b195
parents 039f9a7a e03cc1b4

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

+28 −7
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ import android.app.INotificationManager; 
import android.app.ITransientNotification;

import android.app.ITransientNotificationCallback;

import android.app.IUriGrantsManager;

import android.app.KeyguardManager;

import android.app.Notification;

import android.app.NotificationChannel;

import android.app.NotificationChannelGroup;
@@ -549,6 +550,8 @@ public class NotificationManagerService extends SystemService { 
    // Used for rate limiting toasts by package.

    private MultiRateLimiter mToastRateLimiter;



    private KeyguardManager mKeyguardManager;



    // The last key in this list owns the hardware.

    ArrayList<String> mLights = new ArrayList<>();
@@ -2007,6 +2010,11 @@ public class NotificationManagerService extends SystemService { 
        mAudioManager = audioMananger;

    }



    @VisibleForTesting

    void setKeyguardManager(KeyguardManager keyguardManager) {

        mKeyguardManager = keyguardManager;

    }



    @VisibleForTesting

    ShortcutHelper getShortcutHelper() {

        return mShortcutHelper;
@@ -2653,6 +2661,7 @@ public class NotificationManagerService extends SystemService { 
            mAudioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);

            mAudioManagerInternal = getLocalService(AudioManagerInternal.class);

            mWindowManagerInternal = LocalServices.getService(WindowManagerInternal.class);

            mKeyguardManager = getContext().getSystemService(KeyguardManager.class);

            mZenModeHelper.onSystemReady();

            RoleObserver roleObserver = new RoleObserver(getContext(),

                    getContext().getSystemService(RoleManager.class),
@@ -7388,7 +7397,6 @@ public class NotificationManagerService extends SystemService { 
        boolean beep = false;

        boolean blink = false;



        final Notification notification = record.getSbn().getNotification();

        final String key = record.getKey();



        // Should this notification make noise, vibe, or use the LED?
@@ -7410,7 +7418,7 @@ public class NotificationManagerService extends SystemService { 
        if (!record.isUpdate

                && record.getImportance() > IMPORTANCE_MIN

                && !suppressedByDnd) {

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

            sendAccessibilityEvent(record);

            sentAccessibilityEvent = true;

        }
@@ -7433,7 +7441,7 @@ public class NotificationManagerService extends SystemService { 
                boolean hasAudibleAlert = hasValidSound || hasValidVibrate;

                if (hasAudibleAlert && !shouldMuteNotificationLocked(record)) {

                    if (!sentAccessibilityEvent) {

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

                        sendAccessibilityEvent(record);

                        sentAccessibilityEvent = true;

                    }

                    if (DBG) Slog.v(TAG, "Interrupting!");
@@ -8261,17 +8269,30 @@ public class NotificationManagerService extends SystemService { 
        return (x < low) ? low : ((x > high) ? high : x);

    }



    void sendAccessibilityEvent(Notification notification, CharSequence packageName) {

    void sendAccessibilityEvent(NotificationRecord record) {

        if (!mAccessibilityManager.isEnabled()) {

            return;

        }



        AccessibilityEvent event =

        final Notification notification = record.getNotification();

        final CharSequence packageName = record.getSbn().getPackageName();

        final AccessibilityEvent event =

            AccessibilityEvent.obtain(AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED);

        event.setPackageName(packageName);

        event.setClassName(Notification.class.getName());

        final int visibilityOverride = record.getPackageVisibilityOverride();

        final int notifVisibility = visibilityOverride == NotificationManager.VISIBILITY_NO_OVERRIDE

                ? notification.visibility : visibilityOverride;

        final int userId = record.getUser().getIdentifier();

        final boolean needPublic = userId >= 0 && mKeyguardManager.isDeviceLocked(userId);

        if (needPublic && notifVisibility != Notification.VISIBILITY_PUBLIC) {

            // Emit the public version if we're on the lockscreen and this notification isn't

            // publicly visible.

            event.setParcelableData(notification.publicVersion);

        } else {

            event.setParcelableData(notification);

        CharSequence tickerText = notification.tickerText;

        }

        final CharSequence tickerText = notification.tickerText;

        if (!TextUtils.isEmpty(tickerText)) {

            event.getText().add(tickerText);

        }

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

+93 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.app.ActivityManager;

import android.app.KeyguardManager;

import android.app.Notification;

import android.app.Notification.Builder;

import android.app.NotificationChannel;
@@ -111,6 +112,8 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { 
    NotificationUsageStats mUsageStats;

    @Mock

    IAccessibilityManager mAccessibilityService;

    @Mock

    KeyguardManager mKeyguardManager;

    NotificationRecordLoggerFake mNotificationRecordLogger = new NotificationRecordLoggerFake();

    private InstanceIdSequence mNotificationInstanceIdSequence = new InstanceIdSequenceFake(

            1 << 30);
@@ -153,6 +156,7 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { 
        when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_NORMAL);

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

        when(mVibrator.hasFrequencyControl()).thenReturn(false);

        when(mKeyguardManager.isDeviceLocked(anyInt())).thenReturn(false);



        long serviceReturnValue = IntPair.of(

                AccessibilityManager.STATE_FLAG_ACCESSIBILITY_ENABLED,
@@ -174,6 +178,7 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { 
        mService.setScreenOn(false);

        mService.setUsageStats(mUsageStats);

        mService.setAccessibilityManager(accessibilityManager);

        mService.setKeyguardManager(mKeyguardManager);

        mService.mScreenOn = false;

        mService.mInCallStateOffHook = false;

        mService.mNotificationPulseEnabled = true;
@@ -495,6 +500,94 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { 
        assertNotEquals(-1, r.getLastAudiblyAlertedMs());

    }



    @Test

    public void testLockedPrivateA11yRedaction() throws Exception {

        NotificationRecord r = getBeepyNotification();

        r.setPackageVisibilityOverride(NotificationManager.VISIBILITY_NO_OVERRIDE);

        r.getNotification().visibility = Notification.VISIBILITY_PRIVATE;

        when(mKeyguardManager.isDeviceLocked(anyInt())).thenReturn(true);

        AccessibilityManager accessibilityManager = Mockito.mock(AccessibilityManager.class);

        when(accessibilityManager.isEnabled()).thenReturn(true);

        mService.setAccessibilityManager(accessibilityManager);



        mService.buzzBeepBlinkLocked(r);



        ArgumentCaptor<AccessibilityEvent> eventCaptor =

                ArgumentCaptor.forClass(AccessibilityEvent.class);



        verify(accessibilityManager, times(1))

                .sendAccessibilityEvent(eventCaptor.capture());



        AccessibilityEvent event = eventCaptor.getValue();

        assertEquals(r.getNotification().publicVersion, event.getParcelableData());

    }



    @Test

    public void testLockedOverridePrivateA11yRedaction() throws Exception {

        NotificationRecord r = getBeepyNotification();

        r.setPackageVisibilityOverride(Notification.VISIBILITY_PRIVATE);

        r.getNotification().visibility = Notification.VISIBILITY_PUBLIC;

        when(mKeyguardManager.isDeviceLocked(anyInt())).thenReturn(true);

        AccessibilityManager accessibilityManager = Mockito.mock(AccessibilityManager.class);

        when(accessibilityManager.isEnabled()).thenReturn(true);

        mService.setAccessibilityManager(accessibilityManager);



        mService.buzzBeepBlinkLocked(r);



        ArgumentCaptor<AccessibilityEvent> eventCaptor =

                ArgumentCaptor.forClass(AccessibilityEvent.class);



        verify(accessibilityManager, times(1))

                .sendAccessibilityEvent(eventCaptor.capture());



        AccessibilityEvent event = eventCaptor.getValue();

        assertEquals(r.getNotification().publicVersion, event.getParcelableData());

    }



    @Test

    public void testLockedPublicA11yNoRedaction() throws Exception {

        NotificationRecord r = getBeepyNotification();

        r.setPackageVisibilityOverride(NotificationManager.VISIBILITY_NO_OVERRIDE);

        r.getNotification().visibility = Notification.VISIBILITY_PUBLIC;

        when(mKeyguardManager.isDeviceLocked(anyInt())).thenReturn(true);

        AccessibilityManager accessibilityManager = Mockito.mock(AccessibilityManager.class);

        when(accessibilityManager.isEnabled()).thenReturn(true);

        mService.setAccessibilityManager(accessibilityManager);



        mService.buzzBeepBlinkLocked(r);



        ArgumentCaptor<AccessibilityEvent> eventCaptor =

                ArgumentCaptor.forClass(AccessibilityEvent.class);



        verify(accessibilityManager, times(1))

                .sendAccessibilityEvent(eventCaptor.capture());



        AccessibilityEvent event = eventCaptor.getValue();

        assertEquals(r.getNotification(), event.getParcelableData());

    }



    @Test

    public void testUnlockedPrivateA11yNoRedaction() throws Exception {

        NotificationRecord r = getBeepyNotification();

        r.setPackageVisibilityOverride(NotificationManager.VISIBILITY_NO_OVERRIDE);

        r.getNotification().visibility = Notification.VISIBILITY_PRIVATE;

        when(mKeyguardManager.isDeviceLocked(anyInt())).thenReturn(false);

        AccessibilityManager accessibilityManager = Mockito.mock(AccessibilityManager.class);

        when(accessibilityManager.isEnabled()).thenReturn(true);

        mService.setAccessibilityManager(accessibilityManager);



        mService.buzzBeepBlinkLocked(r);



        ArgumentCaptor<AccessibilityEvent> eventCaptor =

                ArgumentCaptor.forClass(AccessibilityEvent.class);



        verify(accessibilityManager, times(1))

                .sendAccessibilityEvent(eventCaptor.capture());



        AccessibilityEvent event = eventCaptor.getValue();

        assertEquals(r.getNotification(), event.getParcelableData());

    }



    @Test

    public void testBeepInsistently() throws Exception {

        NotificationRecord r = getInsistentBeepyNotification();