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

Commit a7336274 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge changes I3e542532,Id8f2147f into pi-dev am: 68256e09 

am: 9472db8d

Change-Id: I72b6c1ccd2611b7327f202ae6912d7e56f560d1d
parents bc173d60 9472db8d

core/java/android/app/NotificationChannel.java

+5 −1
Original line number Diff line number Diff line
@@ -463,7 +463,11 @@ public final class NotificationChannel implements Parcelable { 


    /**

     * Returns the user specified importance e.g. {@link NotificationManager#IMPORTANCE_LOW} for

     * notifications posted to this channel.

     * notifications posted to this channel. Note: This value might be >

     * {@link NotificationManager#IMPORTANCE_NONE}, but notifications posted to this channel will

     * not be shown to the user if the parent {@link NotificationChannelGroup} or app is blocked.

     * See {@link NotificationChannelGroup#isBlocked()} and

     * {@link NotificationManager#areNotificationsEnabled()}.

     */

    public int getImportance() {

        return mImportance;

core/java/android/app/NotificationChannelGroup.java

+3 −1
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ public final class NotificationChannelGroup implements Parcelable { 


    /**

     * Returns whether or not notifications posted to {@link NotificationChannel channels} belonging

     * to this group are blocked.

     * to this group are blocked. This value is independent of

     * {@link NotificationManager#areNotificationsEnabled()} and

     * {@link NotificationChannel#getImportance()}.

     */

    public boolean isBlocked() {

        return mBlocked;

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

+3 −1
Original line number Diff line number Diff line
@@ -468,12 +468,14 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { 
        private final LinkedList<String> mPendingLookups;

        private final Context mContext;



        // Amount of time to wait for a result from the contacts db before rechecking affinity.

        private static final long LOOKUP_TIME = 1000;

        private float mContactAffinity = NONE;

        private NotificationRecord mRecord;



        private PeopleRankingReconsideration(Context context, String key,

                LinkedList<String> pendingLookups) {

            super(key);

            super(key, LOOKUP_TIME);

            mContext = context;

            mPendingLookups = pendingLookups;

        }