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

Merge "Ignore disallowed adjustments"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-22 19:01:21 +00:00
committed by Android (Google) Code Review
parent 25ad27eb6c 418a8ff9f8
commit fcf394ce18
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -4106,9 +4106,11 @@ public class NotificationManagerService extends SystemService {
if (r == null) {
return;
}
if (adjustment.getSignals() != null) {
Bundle.setDefusable(adjustment.getSignals(), true);
r.addAdjustment(adjustment);
if (mAssistants.isAdjustmentAllowed(adjustment.getKey())) {
if (adjustment.getSignals() != null) {
Bundle.setDefusable(adjustment.getSignals(), true);
r.addAdjustment(adjustment);
}
}
}
@@ -7313,6 +7315,12 @@ public class NotificationManagerService extends SystemService {
}
}
protected boolean isAdjustmentAllowed(String type) {
synchronized (mLock) {
return mAllowedAdjustments.contains(type);
}
}
protected void onNotificationsSeenLocked(ArrayList<NotificationRecord> records) {
// There should be only one, but it's a list, so while we enforce
// singularity elsewhere, we keep it general here, to avoid surprises.

3
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
View File

@@ -353,7 +353,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
FileOutputStream fos = mPolicyFile.startWrite();
fos.write(preupgradeXml.getBytes());
mPolicyFile.finishWrite(fos);
FileInputStream fStream = new FileInputStream(mFile);
// Setup managed services
mListener = mListeners.new ManagedServiceInfo(
@@ -369,6 +368,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
dndConfig.xmlTag = ConditionProviders.TAG_ENABLED_DND_APPS;
when(mConditionProviders.getConfig()).thenReturn(dndConfig);
when(mAssistants.isAdjustmentAllowed(anyString())).thenReturn(true);
try {
mService.init(mTestableLooper.getLooper(),
mPackageManager, mPackageManagerClient, mockLightsManager,