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

Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev

Browse Source
This commit is contained in:
John Spurlock
2014-12-10 19:14:25 +00:00
committed by Android (Google) Code Review
parent d63722429e 8403b7535b
commit e03e245610
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1028,6 +1028,7 @@ public class NotificationManagerService extends SystemService {
? mListenersDisablingEffects.valueAt(0).component : null; ? mListenersDisablingEffects.valueAt(0).component : null;
if (Objects.equals(suppressor, mEffectsSuppressor)) return; if (Objects.equals(suppressor, mEffectsSuppressor)) return;
mEffectsSuppressor = suppressor; mEffectsSuppressor = suppressor;
mZenModeHelper.setEffectsSuppressed(suppressor != null);
getContext().sendBroadcast(new Intent(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED) getContext().sendBroadcast(new Intent(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED)
.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY)); .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY));
} }

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

@@ -17,6 +17,7 @@
package com.android.server.notification; package com.android.server.notification;
import static android.media.AudioAttributes.USAGE_ALARM; import static android.media.AudioAttributes.USAGE_ALARM;
import static android.media.AudioAttributes.USAGE_NOTIFICATION;
import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE; import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;
import android.app.AppOpsManager; import android.app.AppOpsManager;
@@ -77,6 +78,7 @@ public class ZenModeHelper implements AudioManagerInternal.RingerModeDelegate {
private ZenModeConfig mConfig; private ZenModeConfig mConfig;
private AudioManagerInternal mAudioManager; private AudioManagerInternal mAudioManager;
private int mPreviousRingerMode = -1; private int mPreviousRingerMode = -1;
private boolean mEffectsSuppressed;
public ZenModeHelper(Context context, Looper looper) { public ZenModeHelper(Context context, Looper looper) {
mContext = context; mContext = context;
@@ -153,6 +155,12 @@ public class ZenModeHelper implements AudioManagerInternal.RingerModeDelegate {
} }
} }
public void setEffectsSuppressed(boolean effectsSuppressed) {
if (mEffectsSuppressed == effectsSuppressed) return;
mEffectsSuppressed = effectsSuppressed;
applyRestrictions();
}
public boolean shouldIntercept(NotificationRecord record) { public boolean shouldIntercept(NotificationRecord record) {
if (isSystem(record)) { if (isSystem(record)) {
return false; return false;
@@ -225,29 +233,35 @@ public class ZenModeHelper implements AudioManagerInternal.RingerModeDelegate {
ZenLog.traceUpdateZenMode(oldMode, newMode); ZenLog.traceUpdateZenMode(oldMode, newMode);
} }
mZenMode = newMode; mZenMode = newMode;
applyRestrictions();
onZenUpdated(oldMode, newMode);
dispatchOnZenModeChanged();
}
private void applyRestrictions() {
final boolean zen = mZenMode != Global.ZEN_MODE_OFF; final boolean zen = mZenMode != Global.ZEN_MODE_OFF;
final String[] exceptionPackages = null; // none (for now)
// notification restrictions
final boolean muteNotifications = mEffectsSuppressed;
applyRestrictions(muteNotifications, USAGE_NOTIFICATION);
// call restrictions // call restrictions
final boolean muteCalls = zen && !mConfig.allowCalls; final boolean muteCalls = zen && !mConfig.allowCalls || mEffectsSuppressed;
mAppOps.setRestriction(AppOpsManager.OP_VIBRATE, USAGE_NOTIFICATION_RINGTONE, applyRestrictions(muteCalls, USAGE_NOTIFICATION_RINGTONE);
muteCalls ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED,
exceptionPackages);
mAppOps.setRestriction(AppOpsManager.OP_PLAY_AUDIO, USAGE_NOTIFICATION_RINGTONE,
muteCalls ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED,
exceptionPackages);
// alarm restrictions // alarm restrictions
final boolean muteAlarms = mZenMode == Global.ZEN_MODE_NO_INTERRUPTIONS; final boolean muteAlarms = mZenMode == Global.ZEN_MODE_NO_INTERRUPTIONS;
mAppOps.setRestriction(AppOpsManager.OP_VIBRATE, USAGE_ALARM, applyRestrictions(muteAlarms, USAGE_ALARM);
muteAlarms ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED, }
exceptionPackages);
mAppOps.setRestriction(AppOpsManager.OP_PLAY_AUDIO, USAGE_ALARM,
muteAlarms ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED,
exceptionPackages);
onZenUpdated(oldMode, newMode); private void applyRestrictions(boolean mute, int usage) {
dispatchOnZenModeChanged(); final String[] exceptionPackages = null; // none (for now)
mAppOps.setRestriction(AppOpsManager.OP_VIBRATE, usage,
mute ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED,
exceptionPackages);
mAppOps.setRestriction(AppOpsManager.OP_PLAY_AUDIO, usage,
mute ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED,
exceptionPackages);
} }
public void dump(PrintWriter pw, String prefix) { public void dump(PrintWriter pw, String prefix) {
@@ -257,6 +271,7 @@ public class ZenModeHelper implements AudioManagerInternal.RingerModeDelegate {
pw.print(prefix); pw.print("mDefaultConfig="); pw.println(mDefaultConfig); pw.print(prefix); pw.print("mDefaultConfig="); pw.println(mDefaultConfig);
pw.print(prefix); pw.print("mPreviousRingerMode="); pw.println(mPreviousRingerMode); pw.print(prefix); pw.print("mPreviousRingerMode="); pw.println(mPreviousRingerMode);
pw.print(prefix); pw.print("mDefaultPhoneApp="); pw.println(mDefaultPhoneApp); pw.print(prefix); pw.print("mDefaultPhoneApp="); pw.println(mDefaultPhoneApp);
pw.print(prefix); pw.print("mEffectsSuppressed="); pw.println(mEffectsSuppressed);
} }
public void readXml(XmlPullParser parser) throws XmlPullParserException, IOException { public void readXml(XmlPullParser parser) throws XmlPullParserException, IOException {