summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Beverly <beverlyt@google.com> 2017-09-27 09:58:59 -0400
committer Beverly <beverlyt@google.com> 2017-09-27 11:28:42 -0400
commitab804f055444a93cb5bf20eb876dfd11971df427 (patch)
treeb20560977d2205078139a92c653082f00f4565bc
parent4a324cb196ae5d689abb3afb42da22cbf80f9cdf (diff)
In-call-notif doesn't use AUDIBILITY_ENFORCED flag
Audibilty enforced flag should only be used to make sure system sounds are audible when this is mandated by a given country regulation. Here, it was used incorrectly. Also, adjusted in-call notification sound to be less loud. Fixes: 66808711 Test: manual Change-Id: I119a718fb5fc605b6f6b3e387e5e9f956cfd5fff
-rw-r--r--core/res/res/values/config.xml2
-rw-r--r--services/core/java/com/android/server/notification/NotificationManagerService.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 9eed12f679c4..b2727f84e87f 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3023,7 +3023,7 @@
<bool name="config_handleVolumeKeysInWindowManager">false</bool>
<!-- Volume level of in-call notification tone playback [0..1] -->
- <item name="config_inCallNotificationVolume" format="float" type="dimen">.25</item>
+ <item name="config_inCallNotificationVolume" format="float" type="dimen">.10</item>
<!-- URI for in call notification sound -->
<string translatable="false" name="config_inCallNotificationSound">/system/media/audio/ui/InCallNotification.ogg</string>
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 08b96d104266..2c5ef23d07d4 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1278,13 +1278,11 @@ public class NotificationManagerService extends SystemService {
R.array.config_notificationFallbackVibePattern,
VIBRATE_PATTERN_MAXLEN,
DEFAULT_VIBRATE_PATTERN);
-
mInCallNotificationUri = Uri.parse("file://" +
resources.getString(R.string.config_inCallNotificationSound));
mInCallNotificationAudioAttributes = new AudioAttributes.Builder()
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
- .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED)
.build();
mInCallNotificationVolume = resources.getFloat(R.dimen.config_inCallNotificationVolume);