Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I3e542532,Id8f2147f into pi-dev

Browse Source 
* changes:
  Update notification blocking documentation.
  Wait before computing contact affinity
This commit is contained in:
TreeHugger Robot
2018-03-30 00:10:22 +00:00
committed by Android (Google) Code Review
parent 3cda0f2989 8d2b053611
commit 68256e09d9
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/NotificationChannel.java
View File

@@ -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;

4
core/java/android/app/NotificationChannelGroup.java
View File

@@ -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;

4
services/core/java/com/android/server/notification/ValidateNotificationPeople.java
View File

@@ -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;
}