Merge "Don't increase notif importance when shouldSilence"

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityThread;

import android.app.AlarmManager;

import android.app.INotificationManager;

import android.app.Notification;

import android.app.NotificationChannel;

    }

    /** A convenience helper for creating an adjustment for an SBN. */

    @VisibleForTesting

    @Nullable

    private Adjustment createEnqueuedNotificationAdjustment(

    Adjustment createEnqueuedNotificationAdjustment(

            @NonNull NotificationEntry entry,

            @NonNull ArrayList<Notification.Action> smartActions,

            @NonNull ArrayList<CharSequence> smartReplies) {

            signals.putCharSequenceArrayList(Adjustment.KEY_SMART_REPLIES, smartReplies);

        }

        if (mNotificationCategorizer.shouldSilence(entry)) {

            signals.putInt(KEY_IMPORTANCE, IMPORTANCE_LOW);

            final int importance = entry.getImportance() < IMPORTANCE_LOW ? entry.getImportance()

                    : IMPORTANCE_LOW;

            signals.putInt(KEY_IMPORTANCE, importance);

        }

        return new Adjustment(

import java.io.ByteArrayInputStream;

import java.io.ByteArrayOutputStream;

import java.io.FileOutputStream;

import java.util.ArrayList;

public class AssistantTest extends ServiceTestCase<Assistant> {

        assertFalse(mAssistant.mLiveNotifications.containsKey(sbn.getKey()));

    }

    @Test

    public void testAssistantNeverIncreasesImportanceWhenSuggestingSilent() throws Exception {

        StatusBarNotification sbn = generateSbn(PKG1, UID1, P1C3, "min notif!", null);

        Adjustment adjust = mAssistant.createEnqueuedNotificationAdjustment(new NotificationEntry(

                mPackageManager, sbn, P1C3), new ArrayList<>(), new ArrayList<>());

        assertEquals(IMPORTANCE_MIN, adjust.getSignals().getInt(Adjustment.KEY_IMPORTANCE));

    }

}