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

Merge "Make non-blockable notification more robust" into rvc-d1-dev am: d8c6c356c3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12333120

Change-Id: I60aeeebfe0c1598817cf608135e0ae9f9808d324
This commit is contained in:
TreeHugger Robot
2020-08-10 16:30:31 +00:00
committed by Automerger Merge Worker
parent d362bd0e16 d8c6c356c3
commit 2af8e46e72
2 changed files with 117 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/core/java/com/android/server/notification/PreferencesHelper.java
View File

@@ -75,6 +75,7 @@ import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -173,6 +174,8 @@ public class PreferencesHelper implements RankingConfig {
private boolean mAllowInvalidShortcuts = false;
private Map<String, List<String>> mOemLockedApps = new HashMap();
public PreferencesHelper(Context context, PackageManager pm, RankingHandler rankingHandler,
ZenModeHelper zenHelper, NotificationChannelLogger notificationChannelLogger,
AppOpsManager appOpsManager,
@@ -314,6 +317,12 @@ public class PreferencesHelper implements RankingConfig {
}
channel.setImportanceLockedByCriticalDeviceFunction(
r.defaultAppLockedImportance);
channel.setImportanceLockedByOEM(r.oemLockedImportance);
if (!channel.isImportanceLockedByOEM()) {
if (r.oemLockedChannels.contains(channel.getId())) {
channel.setImportanceLockedByOEM(true);
}
}
boolean isInvalidShortcutChannel =
channel.getConversationId() != null &&
channel.getConversationId().contains(
@@ -396,6 +405,14 @@ public class PreferencesHelper implements RankingConfig {
r.visibility = visibility;
r.showBadge = showBadge;
r.bubblePreference = bubblePreference;
if (mOemLockedApps.containsKey(r.pkg)) {
List<String> channels = mOemLockedApps.get(r.pkg);
if (channels == null || channels.isEmpty()) {
r.oemLockedImportance = true;
} else {
r.oemLockedChannels = channels;
}
}
try {
createDefaultChannelIfNeededLocked(r);
@@ -1149,8 +1166,10 @@ public class PreferencesHelper implements RankingConfig {
String channelId = appSplit.length == 2 ? appSplit[1] : null;
synchronized (mPackagePreferences) {
boolean foundApp = false;
for (PackagePreferences r : mPackagePreferences.values()) {
if (r.pkg.equals(appName)) {
foundApp = true;
if (channelId == null) {
// lock all channels for the app
r.oemLockedImportance = true;
@@ -1168,6 +1187,14 @@ public class PreferencesHelper implements RankingConfig {
}
}
}
if (!foundApp) {
List<String> channels =
mOemLockedApps.getOrDefault(appName, new ArrayList<>());
if (channelId != null) {
channels.add(channelId);
}
mOemLockedApps.put(appName, channels);
}
}
}
}

90
services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
View File

@@ -2669,6 +2669,96 @@ public class PreferencesHelperTest extends UiServiceTestCase {
.isImportanceLockedByOEM());
}
@Test
public void testLockChannelsForOEM_onlyGivenPkg_appDoesNotExistYet() {
mHelper.lockChannelsForOEM(new String[] {PKG_O});
NotificationChannel a = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
NotificationChannel b = new NotificationChannel("b", "b", IMPORTANCE_LOW);
mHelper.createNotificationChannel(PKG_O, 3, a, true, false);
mHelper.createNotificationChannel(PKG_N_MR1, 30, b, false, false);
assertTrue(mHelper.getNotificationChannel(PKG_O, 3, a.getId(), false)
.isImportanceLockedByOEM());
assertFalse(mHelper.getNotificationChannel(PKG_N_MR1, 30, b.getId(), false)
.isImportanceLockedByOEM());
}
@Test
public void testLockChannelsForOEM_channelSpecific_appDoesNotExistYet() {
mHelper.lockChannelsForOEM(new String[] {PKG_O + ":b", PKG_O + ":c"});
NotificationChannel a = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
NotificationChannel b = new NotificationChannel("b", "b", IMPORTANCE_LOW);
NotificationChannel c = new NotificationChannel("c", "c", IMPORTANCE_DEFAULT);
// different uids, same package
mHelper.createNotificationChannel(PKG_O, 3, a, true, false);
mHelper.createNotificationChannel(PKG_O, 3, b, false, false);
mHelper.createNotificationChannel(PKG_O, 30, c, true, true);
assertFalse(mHelper.getNotificationChannel(PKG_O, 3, a.getId(), false)
.isImportanceLockedByOEM());
assertTrue(mHelper.getNotificationChannel(PKG_O, 3, b.getId(), false)
.isImportanceLockedByOEM());
assertTrue(mHelper.getNotificationChannel(PKG_O, 30, c.getId(), false)
.isImportanceLockedByOEM());
}
@Test
public void testLockChannelsForOEM_onlyGivenPkg_appDoesNotExistYet_restoreData()
throws Exception {
mHelper.lockChannelsForOEM(new String[] {PKG_O});
final String xml = "<ranking version=\"1\">\n"
+ "<package name=\"" + PKG_O + "\" uid=\"" + UID_O + "\" >\n"
+ "<channel id=\"a\" name=\"a\" importance=\"3\"/>"
+ "<channel id=\"b\" name=\"b\" importance=\"3\"/>"
+ "</package>"
+ "<package name=\"" + PKG_N_MR1 + "\" uid=\"" + UID_N_MR1 + "\" >\n"
+ "<channel id=\"a\" name=\"a\" importance=\"3\"/>"
+ "<channel id=\"b\" name=\"b\" importance=\"3\"/>"
+ "</package>"
+ "</ranking>";
XmlPullParser parser = Xml.newPullParser();
parser.setInput(new BufferedInputStream(new ByteArrayInputStream(xml.getBytes())),
null);
parser.nextTag();
mHelper.readXml(parser, false, UserHandle.USER_ALL);
assertTrue(mHelper.getNotificationChannel(PKG_O, UID_O, "a", false)
.isImportanceLockedByOEM());
assertFalse(mHelper.getNotificationChannel(PKG_N_MR1, UID_N_MR1, "b", false)
.isImportanceLockedByOEM());
}
@Test
public void testLockChannelsForOEM_channelSpecific_appDoesNotExistYet_restoreData()
throws Exception {
mHelper.lockChannelsForOEM(new String[] {PKG_O + ":b", PKG_O + ":c"});
final String xml = "<ranking version=\"1\">\n"
+ "<package name=\"" + PKG_O + "\" uid=\"" + 3 + "\" >\n"
+ "<channel id=\"a\" name=\"a\" importance=\"3\"/>"
+ "<channel id=\"b\" name=\"b\" importance=\"3\"/>"
+ "</package>"
+ "<package name=\"" + PKG_O + "\" uid=\"" + 30 + "\" >\n"
+ "<channel id=\"c\" name=\"c\" importance=\"3\"/>"
+ "</package>"
+ "</ranking>";
XmlPullParser parser = Xml.newPullParser();
parser.setInput(new BufferedInputStream(new ByteArrayInputStream(xml.getBytes())),
null);
parser.nextTag();
mHelper.readXml(parser, false, UserHandle.USER_ALL);
assertFalse(mHelper.getNotificationChannel(PKG_O, 3, "a", false)
.isImportanceLockedByOEM());
assertTrue(mHelper.getNotificationChannel(PKG_O, 3, "b", false)
.isImportanceLockedByOEM());
assertTrue(mHelper.getNotificationChannel(PKG_O, 30, "c", false)
.isImportanceLockedByOEM());
}
@Test
public void testLockChannelsForOEM_channelSpecific_clearData() {
NotificationChannel a = new NotificationChannel("a", "a", IMPORTANCE_HIGH);