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

Merge "Allow notfication vibrations in DND" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-09 15:18:39 +00:00
committed by Android (Google) Code Review
parent e61d9aa040 cb7d292691
commit d00160c0af
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,7 @@ import static android.content.pm.PackageManager.MATCH_ALL;
import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE; import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE; import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.media.AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY;
import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE; import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;
import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL; import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL;
import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL; import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL;
@@ -7100,8 +7101,15 @@ public class NotificationManagerService extends SystemService {
// so need to check the notification still valide for vibrate. // so need to check the notification still valide for vibrate.
synchronized (mNotificationLock) { synchronized (mNotificationLock) {
if (mNotificationsByKey.get(record.getKey()) != null) { if (mNotificationsByKey.get(record.getKey()) != null) {
// Vibrator checks the appops for the op package, not the caller,
// so we need to add the bypass dnd flag to be heard. it's ok to
// always add this flag here because we've already checked that we can
// bypass dnd
AudioAttributes.Builder aab =
new AudioAttributes.Builder(record.getAudioAttributes())
.setFlags(FLAG_BYPASS_INTERRUPTION_POLICY);
mVibrator.vibrate(record.getSbn().getUid(), record.getSbn().getOpPkg(), mVibrator.vibrate(record.getSbn().getUid(), record.getSbn().getOpPkg(),
effect, "Notification (delayed)", record.getAudioAttributes()); effect, "Notification (delayed)", aab.build());
} else { } else {
Slog.e(TAG, "No vibration for canceled notification : " Slog.e(TAG, "No vibration for canceled notification : "
+ record.getKey()); + record.getKey());