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

Merge \"Always apply config updates.\" into mnc-dr-dev

Browse Source 
am: f437bd068c

Change-Id: I899b923c075a5f3351c4791a23a94adf123d1247
This commit is contained in:
Julia Reynolds
2016-07-01 15:26:58 +00:00
committed by android-build-merger
parent b281795c12 f437bd068c
commit 2a44859c21
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,14 +332,16 @@ public class ZenModeHelper {
}
mConditions.evaluateConfig(config, false /*processSubscriptions*/); // may modify config
mConfigs.put(config.user, config);
if (config.equals(mConfig)) return true;
if (DEBUG) Log.d(TAG, "setConfig reason=" + reason, new Throwable());
ZenLog.traceConfig(reason, mConfig, config);
final boolean policyChanged = !Objects.equals(getNotificationPolicy(mConfig),
getNotificationPolicy(config));
boolean configChanged = !config.equals(mConfig);
mConfig = config;
dispatchOnConfigChanged();
if (policyChanged){
if (configChanged) {
dispatchOnConfigChanged();
}
if (policyChanged) {
dispatchOnPolicyChanged();
}
final String val = Integer.toString(mConfig.hashCode());
@@ -372,9 +374,9 @@ public class ZenModeHelper {
private boolean evaluateZenMode(String reason, boolean setRingerMode) {
if (DEBUG) Log.d(TAG, "evaluateZenMode");
final int zenBefore = mZenMode;
final ArraySet<ZenRule> automaticRules = new ArraySet<ZenRule>();
final int zen = computeZenMode(automaticRules);
if (zen == mZenMode) return false;
ZenLog.traceSetZenMode(zen, reason);
mZenMode = zen;
updateRingerModeAffectedStreams();
@@ -383,7 +385,9 @@ public class ZenModeHelper {
applyZenToRingerMode();
}
applyRestrictions();
mHandler.postDispatchOnZenModeChanged();
if (zen != zenBefore) {
mHandler.postDispatchOnZenModeChanged();
}
return true;
}