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

Exempt more notifications from heuristic

Browse Source 
Bug: 123942966
Test: atest
Change-Id: I3415b992b3fb5397f7a8ea080de6d0c11b259417
This commit is contained in:
Julia Reynolds
2019-02-05 15:49:56 -05:00
parent e8c4958b2f
commit 11e085ad95
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/ExtServices/src/android/ext/services/notification/NotificationCategorizer.java
View File

@@ -15,6 +15,7 @@
*/
package android.ext.services.notification;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_MIN;
@@ -91,7 +92,7 @@ public class NotificationCategorizer {
}
// TODO: is from signature app
if (entry.getSbn().getUid() < Process.FIRST_APPLICATION_UID) {
if (entry.getImportance() >= IMPORTANCE_HIGH) {
if (entry.getImportance() >= IMPORTANCE_DEFAULT) {
return CATEGORY_SYSTEM;
} else {
return CATEGORY_SYSTEM_LOW;

11
packages/ExtServices/tests/src/android/ext/services/notification/NotificationCategorizerTest.java
View File

@@ -18,6 +18,7 @@ package android.ext.services.notification;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_MIN;
import static android.os.Process.FIRST_APPLICATION_UID;
@@ -172,23 +173,23 @@ public class NotificationCategorizerTest {
public void testSystemCategory() {
NotificationCategorizer nc = new NotificationCategorizer();
when(mEntry.getChannel()).thenReturn(new NotificationChannel("", "", IMPORTANCE_HIGH));
when(mEntry.getImportance()).thenReturn(IMPORTANCE_HIGH);
when(mEntry.getChannel()).thenReturn(new NotificationChannel("", "", IMPORTANCE_DEFAULT));
when(mEntry.getImportance()).thenReturn(IMPORTANCE_DEFAULT);
when(mSbn.getUid()).thenReturn(FIRST_APPLICATION_UID - 1);
assertEquals(NotificationCategorizer.CATEGORY_SYSTEM, nc.getCategory(mEntry));
assertFalse(nc.shouldSilence(NotificationCategorizer.CATEGORY_SYSTEM));
when(mSbn.getUid()).thenReturn(FIRST_APPLICATION_UID);
assertEquals(NotificationCategorizer.CATEGORY_HIGH, nc.getCategory(mEntry));
assertEquals(NotificationCategorizer.CATEGORY_EVERYTHING_ELSE, nc.getCategory(mEntry));
}
@Test
public void testSystemLowCategory() {
NotificationCategorizer nc = new NotificationCategorizer();
when(mEntry.getChannel()).thenReturn(new NotificationChannel("", "", IMPORTANCE_DEFAULT));
when(mEntry.getImportance()).thenReturn(IMPORTANCE_DEFAULT);
when(mEntry.getChannel()).thenReturn(new NotificationChannel("", "", IMPORTANCE_LOW));
when(mEntry.getImportance()).thenReturn(IMPORTANCE_LOW);
when(mSbn.getUid()).thenReturn(FIRST_APPLICATION_UID - 1);
assertEquals(NotificationCategorizer.CATEGORY_SYSTEM_LOW, nc.getCategory(mEntry));