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

am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev

Browse Source 
* commit '2a6f1d4af39a72abecf16cc0a95feda7431afc07':
  ZenModeHelper: fix cross deadlock with AudioService
This commit is contained in:
Eric Laurent
2015-10-07 13:46:48 +00:00
committed by Android Git Automerger
parent 235a6911b0 2a6f1d4af3
commit f5d3f96001
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,7 +104,7 @@ public class ZenModeConditions implements ConditionProviders.Callback {
public void onServiceAdded(ComponentName component) {
if (DEBUG) Log.d(TAG, "onServiceAdded " + component);
if (isAutomaticActive(component)) {
mHelper.setConfig(mHelper.getConfig(), "zmc.onServiceAdded");
mHelper.setConfigAsync(mHelper.getConfig(), "zmc.onServiceAdded");
}
}
@@ -120,7 +120,7 @@ public class ZenModeConditions implements ConditionProviders.Callback {
updated |= updateSnoozing(automaticRule);
}
if (updated) {
mHelper.setConfig(config, "conditionChanged");
mHelper.setConfigAsync(config, "conditionChanged");
}
}

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

@@ -315,6 +315,10 @@ public class ZenModeHelper {
return setConfig(config, reason, true /*setRingerMode*/);
}
public void setConfigAsync(ZenModeConfig config, String reason) {
mHandler.postSetConfig(config, reason);
}
private boolean setConfig(ZenModeConfig config, String reason, boolean setRingerMode) {
if (config == null || !config.isValid()) {
Log.w(TAG, "Invalid config in setConfig; " + config);
@@ -742,6 +746,17 @@ public class ZenModeHelper {
private final class H extends Handler {
private static final int MSG_DISPATCH = 1;
private static final int MSG_METRICS = 2;
private static final int MSG_SET_CONFIG = 3;
private final class ConfigMessageData {
public final ZenModeConfig config;
public final String reason;
ConfigMessageData(ZenModeConfig config, String reason) {
this.config = config;
this.reason = reason;
}
}
private static final long METRICS_PERIOD_MS = 6 * 60 * 60 * 1000;
@@ -759,6 +774,10 @@ public class ZenModeHelper {
sendEmptyMessageDelayed(MSG_METRICS, METRICS_PERIOD_MS);
}
private void postSetConfig(ZenModeConfig config, String reason) {
sendMessage(obtainMessage(MSG_SET_CONFIG, new ConfigMessageData(config, reason)));
}
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
@@ -768,6 +787,10 @@ public class ZenModeHelper {
case MSG_METRICS:
mMetrics.emit();
break;
case MSG_SET_CONFIG:
ConfigMessageData configData = (ConfigMessageData)msg.obj;
setConfig(configData.config, configData.reason);
break;
}
}
}