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

Commit 3cb6842a authored by Wenhao Wang's avatar Wenhao Wang
Browse files

Suppress notifications when device enter lockdown 

This CL makes the following modifcations:
1. Add LockPatternUtils.StrongAuthTracker to monitor
the lockdown mode status of the phone.
2. Call mListeners.notifyRemovedLocked with all the
notifications in the mNotificationList when entering
the lockdown mode.
3. Call mListeners.notifyPostedLocked with all the
notifications in the mNotificationList when exiting
the lockdown mode.
4. Dismiss the function calls of notifyPostedLocked,
notifyRemovedLocked, and notifyRankingUpdateLocked
during the lockdown mode.

The CL also adds corresponding tests.

Bug: 173721373
Test: atest NotificationManagerServiceTest
Test: atest NotificationListenersTest
Test: manually verify the paired device cannot receive
notifications when the host phone is in lockdown mode.
Ignore-AOSP-First: pending fix for a security issue.

Change-Id: I7e83544863eeadf8272b6ff8a9bb8136d6466203
parent 7505d063

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39069,6 +39069,7 @@ package android.service.notification { 
    field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc

    field public static final int REASON_LISTENER_CANCEL = 10; // 0xa

    field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb

    field public static final int REASON_LOCKDOWN = 22; // 0x16

    field public static final int REASON_PACKAGE_BANNED = 7; // 0x7

    field public static final int REASON_PACKAGE_CHANGED = 5; // 0x5

    field public static final int REASON_PACKAGE_SUSPENDED = 14; // 0xe

core/java/android/service/notification/NotificationListenerService.java

+3 −0
Original line number Diff line number Diff line
@@ -258,6 +258,8 @@ public abstract class NotificationListenerService extends Service { 
    public static final int REASON_CLEAR_DATA = 21;

    /** Notification was canceled due to an assistant adjustment update. */

    public static final int REASON_ASSISTANT_CANCEL = 22;

    /** Notification was canceled when lockdown mode is enabled. */

    public static final int REASON_LOCKDOWN = 22;



    /**

     * @hide
@@ -285,6 +287,7 @@ public abstract class NotificationListenerService extends Service { 
            REASON_CHANNEL_REMOVED,

            REASON_CLEAR_DATA,

            REASON_ASSISTANT_CANCEL,

            REASON_LOCKDOWN,

    })

    public @interface NotificationCancelReason{};

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

+99 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ import static android.service.notification.NotificationListenerService.REASON_ER 
import static android.service.notification.NotificationListenerService.REASON_GROUP_SUMMARY_CANCELED;

import static android.service.notification.NotificationListenerService.REASON_LISTENER_CANCEL;

import static android.service.notification.NotificationListenerService.REASON_LISTENER_CANCEL_ALL;

import static android.service.notification.NotificationListenerService.REASON_LOCKDOWN;

import static android.service.notification.NotificationListenerService.REASON_PACKAGE_BANNED;

import static android.service.notification.NotificationListenerService.REASON_PACKAGE_CHANGED;

import static android.service.notification.NotificationListenerService.REASON_PACKAGE_SUSPENDED;
@@ -251,6 +252,7 @@ import android.util.Log; 
import android.util.Pair;

import android.util.Slog;

import android.util.SparseArray;

import android.util.SparseBooleanArray;

import android.util.StatsEvent;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;
@@ -283,6 +285,7 @@ import com.android.internal.util.DumpUtils; 
import com.android.internal.util.Preconditions;

import com.android.internal.util.XmlUtils;

import com.android.internal.util.function.TriPredicate;

import com.android.internal.widget.LockPatternUtils;

import com.android.server.DeviceIdleInternal;

import com.android.server.EventLogTags;

import com.android.server.IoThread;
@@ -1912,6 +1915,54 @@ public class NotificationManagerService extends SystemService { 
    private SettingsObserver mSettingsObserver;

    protected ZenModeHelper mZenModeHelper;













    protected class StrongAuthTracker extends LockPatternUtils.StrongAuthTracker {

























        SparseBooleanArray mUserInLockDownMode = new SparseBooleanArray();













        boolean mIsInLockDownMode = false;

























        StrongAuthTracker(Context context) {













            super(context);













        }

























        private boolean containsFlag(int haystack, int needle) {













            return (haystack & needle) != 0;













        }

























        public boolean isInLockDownMode() {













            return mIsInLockDownMode;













        }

























        @Override













        public synchronized void onStrongAuthRequiredChanged(int userId) {













            boolean userInLockDownModeNext = containsFlag(getStrongAuthForUser(userId),













                    STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN);













            mUserInLockDownMode.put(userId, userInLockDownModeNext);













            boolean isInLockDownModeNext = mUserInLockDownMode.indexOfValue(true) != -1;

























            if (mIsInLockDownMode == isInLockDownModeNext) {













                return;













            }

























            if (isInLockDownModeNext) {













                cancelNotificationsWhenEnterLockDownMode();













            }

























            // When the mIsInLockDownMode is true, both notifyPostedLocked and













            // notifyRemovedLocked will be dismissed. So we shall call













            // cancelNotificationsWhenEnterLockDownMode before we set mIsInLockDownMode













            // as true and call postNotificationsWhenExitLockDownMode after we set













            // mIsInLockDownMode as false.













            mIsInLockDownMode = isInLockDownModeNext;

























            if (!isInLockDownModeNext) {













                postNotificationsWhenExitLockDownMode();













            }













        }













    }

























    private LockPatternUtils mLockPatternUtils;













    private StrongAuthTracker mStrongAuthTracker;



























    public NotificationManagerService(Context context) {















        this(context,















                new NotificationRecordLoggerImpl(),










@@ -1940,6 +1991,11 @@ public class NotificationManagerService extends SystemService {













        mAudioManager = audioMananger;















    }



























    @VisibleForTesting













    void setStrongAuthTracker(StrongAuthTracker strongAuthTracker) {













        mStrongAuthTracker = strongAuthTracker;













    }



























    @VisibleForTesting















    void setKeyguardManager(KeyguardManager keyguardManager) {















        mKeyguardManager = keyguardManager;










@@ -2132,6 +2188,8 @@ public class NotificationManagerService extends SystemService {













        mPlatformCompat = IPlatformCompat.Stub.asInterface(















                ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));



























        mLockPatternUtils = new LockPatternUtils(getContext());













        mStrongAuthTracker = new StrongAuthTracker(getContext());















        mUiHandler = new Handler(UiThread.get().getLooper());















        String[] extractorNames;















        try {










@@ -2627,6 +2685,7 @@ public class NotificationManagerService extends SystemService {













                bubbsExtractor.setShortcutHelper(mShortcutHelper);















            }















            registerNotificationPreferencesPullers();













            mLockPatternUtils.registerStrongAuthTracker(mStrongAuthTracker);















        } else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) {















            // This observer will force an update when observe is called, causing us to















            // bind to listener services.










@@ -9500,6 +9559,29 @@ public class NotificationManagerService extends SystemService {













        }















    }



























    private void cancelNotificationsWhenEnterLockDownMode() {













        synchronized (mNotificationLock) {













            int numNotifications = mNotificationList.size();













            for (int i = 0; i < numNotifications; i++) {













                NotificationRecord rec = mNotificationList.get(i);













                mListeners.notifyRemovedLocked(rec, REASON_LOCKDOWN,













                        rec.getStats());













            }

























        }













    }

























    private void postNotificationsWhenExitLockDownMode() {













        synchronized (mNotificationLock) {













            int numNotifications = mNotificationList.size();













            for (int i = 0; i < numNotifications; i++) {













                NotificationRecord rec = mNotificationList.get(i);













                mListeners.notifyPostedLocked(rec, rec);













            }

























        }













    }



























    private void updateNotificationPulse() {















        synchronized (mNotificationLock) {















            updateLightsLocked();










@@ -9716,6 +9798,10 @@ public class NotificationManagerService extends SystemService {













                rankings.toArray(new NotificationListenerService.Ranking[0]));















    }



























    boolean isInLockDownMode() {













        return mStrongAuthTracker.isInLockDownMode();













    }



























    boolean hasCompanionDevice(ManagedServiceInfo info) {















        if (mCompanionManager == null) {















            mCompanionManager = getCompanionManager();










@@ -10767,8 +10853,12 @@ public class NotificationManagerService extends SystemService {













         *                           targetting <= O_MR1















         */















        @GuardedBy("mNotificationLock")













        private void notifyPostedLocked(NotificationRecord r, NotificationRecord old,













        void notifyPostedLocked(NotificationRecord r, NotificationRecord old,















                boolean notifyAllListeners) {













            if (isInLockDownMode()) {













                return;













            }



























            try {















                // Lazily initialized snapshots of the notification.















                StatusBarNotification sbn = r.getSbn();










@@ -10866,6 +10956,10 @@ public class NotificationManagerService extends SystemService {













        @GuardedBy("mNotificationLock")















        public void notifyRemovedLocked(NotificationRecord r, int reason,















                NotificationStats notificationStats) {













            if (isInLockDownMode()) {













                return;













            }



























            final StatusBarNotification sbn = r.getSbn();





























            // make a copy in case changes are made to the underlying Notification object










@@ -10911,6 +11005,10 @@ public class NotificationManagerService extends SystemService {













         */















        @GuardedBy("mNotificationLock")















        public void notifyRankingUpdateLocked(List<NotificationRecord> changedHiddenNotifications) {













            if (isInLockDownMode()) {













                return;













            }



























            boolean isHiddenRankingUpdate = changedHiddenNotifications != null















                    && changedHiddenNotifications.size() > 0;















            // TODO (b/73052211): if the ranking update changed the notification type,

































services/tests/uiservicestests/AndroidManifest.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -33,6 +33,7 @@













    <uses-permission android:name="android.permission.OBSERVE_ROLE_HOLDERS" />















    <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT"/>















    <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG" />













    <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />































    <application android:debuggable="true">















        <uses-library android:name="android.test.runner" />

































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



+69
−0




























Original line number
Diff line number
Diff line








@@ -30,8 +30,11 @@ import static junit.framework.Assert.assertTrue;













import static org.mockito.ArgumentMatchers.any;















import static org.mockito.ArgumentMatchers.eq;















import static org.mockito.ArgumentMatchers.nullable;













import static org.mockito.Mockito.atLeast;















import static org.mockito.Mockito.doNothing;















import static org.mockito.Mockito.mock;













import static org.mockito.Mockito.never;













import static org.mockito.Mockito.reset;















import static org.mockito.Mockito.spy;















import static org.mockito.Mockito.verify;















import static org.mockito.Mockito.when;









@@ -46,6 +49,8 @@ import android.os.Bundle;













import android.os.UserHandle;















import android.service.notification.NotificationListenerFilter;















import android.service.notification.NotificationListenerService;













import android.service.notification.NotificationStats;













import android.service.notification.StatusBarNotification;















import android.testing.TestableContext;















import android.util.ArraySet;















import android.util.Pair;









@@ -59,11 +64,13 @@ import org.junit.Before;













import org.junit.Test;















import org.mockito.Mock;















import org.mockito.MockitoAnnotations;













import org.mockito.internal.util.reflection.FieldSetter;































import java.io.BufferedInputStream;















import java.io.BufferedOutputStream;















import java.io.ByteArrayInputStream;















import java.io.ByteArrayOutputStream;













import java.util.List;































public class NotificationListenersTest extends UiServiceTestCase {


























@@ -388,4 +395,66 @@ public class NotificationListenersTest extends UiServiceTestCase {













        verify(mContext).sendBroadcastAsUser(















                any(), eq(UserHandle.of(userId)), nullable(String.class));















    }



























    @Test













    public void testNotifyPostedLockedInLockdownMode() {













        NotificationRecord r = mock(NotificationRecord.class);













        NotificationRecord old = mock(NotificationRecord.class);



























        // before the lockdown mode













        when(mNm.isInLockDownMode()).thenReturn(false);













        mListeners.notifyPostedLocked(r, old, true);













        mListeners.notifyPostedLocked(r, old, false);













        verify(r, atLeast(2)).getSbn();



























        // in the lockdown mode













        reset(r);













        reset(old);













        when(mNm.isInLockDownMode()).thenReturn(true);













        mListeners.notifyPostedLocked(r, old, true);













        mListeners.notifyPostedLocked(r, old, false);













        verify(r, never()).getSbn();













    }



























    @Test













    public void testnotifyRankingUpdateLockedInLockdownMode() {













        List chn = mock(List.class);



























        // before the lockdown mode













        when(mNm.isInLockDownMode()).thenReturn(false);













        mListeners.notifyRankingUpdateLocked(chn);













        verify(chn, atLeast(1)).size();



























        // in the lockdown mode













        reset(chn);













        when(mNm.isInLockDownMode()).thenReturn(true);













        mListeners.notifyRankingUpdateLocked(chn);













        verify(chn, never()).size();













    }



























    @Test













    public void testNotifyRemovedLockedInLockdownMode() throws NoSuchFieldException {













        NotificationRecord r = mock(NotificationRecord.class);













        NotificationStats rs = mock(NotificationStats.class);













        StatusBarNotification sbn = mock(StatusBarNotification.class);













        FieldSetter.setField(mNm,













                NotificationManagerService.class.getDeclaredField("mHandler"),













                mock(NotificationManagerService.WorkerHandler.class));



























        // before the lockdown mode













        when(mNm.isInLockDownMode()).thenReturn(false);













        when(r.getSbn()).thenReturn(sbn);













        mListeners.notifyRemovedLocked(r, 0, rs);













        mListeners.notifyRemovedLocked(r, 0, rs);













        verify(r, atLeast(2)).getSbn();



























        // in the lockdown mode













        reset(r);













        reset(rs);













        when(mNm.isInLockDownMode()).thenReturn(true);













        when(r.getSbn()).thenReturn(sbn);













        mListeners.notifyRemovedLocked(r, 0, rs);













        mListeners.notifyRemovedLocked(r, 0, rs);













        verify(r, never()).getSbn();













    }















}