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

Commit 418a8ff9 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Ignore disallowed adjustments

Test: xts
Bug: 127825514
Change-Id: I82da0ca798f164dc9a2954e8fb78597480d5e76b
parent 2c83d371
Loading
Loading
Loading
Loading
+11 −3
Original line number Diff line number Diff line
@@ -4106,11 +4106,13 @@ public class NotificationManagerService extends SystemService {
        if (r == null) {
            return;
        }
        if (mAssistants.isAdjustmentAllowed(adjustment.getKey())) {
            if (adjustment.getSignals() != null) {
                Bundle.setDefusable(adjustment.getSignals(), true);
                r.addAdjustment(adjustment);
            }
        }
    }

    @GuardedBy("mNotificationLock")
    void addAutogroupKeyLocked(String key) {
@@ -7313,6 +7315,12 @@ public class NotificationManagerService extends SystemService {
            }
        }

        protected boolean isAdjustmentAllowed(String type) {
            synchronized (mLock) {
                return mAllowedAdjustments.contains(type);
            }
        }

        protected void onNotificationsSeenLocked(ArrayList<NotificationRecord> records) {
            // There should be only one, but it's a list, so while we enforce
            // singularity elsewhere, we keep it general here, to avoid surprises.
+2 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
        FileOutputStream fos = mPolicyFile.startWrite();
        fos.write(preupgradeXml.getBytes());
        mPolicyFile.finishWrite(fos);
        FileInputStream fStream = new FileInputStream(mFile);

        // Setup managed services
        mListener = mListeners.new ManagedServiceInfo(
@@ -369,6 +368,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
        dndConfig.xmlTag = ConditionProviders.TAG_ENABLED_DND_APPS;
        when(mConditionProviders.getConfig()).thenReturn(dndConfig);

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

        try {
            mService.init(mTestableLooper.getLooper(),
                    mPackageManager, mPackageManagerClient, mockLightsManager,