diff options
| author | 2017-09-28 01:51:23 +0000 | |
|---|---|---|
| committer | 2017-09-28 01:51:23 +0000 | |
| commit | 20464662b848ad7aa8779aef1cec6c4fb2eaa980 (patch) | |
| tree | 7452737de171c5c069fd1bee09fd32a833126bb7 | |
| parent | 0397bc7008c1db40897bd1dc572a49e9a0301455 (diff) | |
| parent | 1986261870ae24a5653c374f8d6c0bb0f8a99681 (diff) | |
Merge "In-call-notif doesn't use AUDIBILITY_ENFORCED flag" into oc-mr1-dev
am: 1986261870
Change-Id: I79e08d9cbfce62b6e4c668858e1bf366760cd969
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/notification/NotificationManagerService.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 2efa384d0384..9cdfd7d39c29 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3038,7 +3038,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 77769cd84fd9..4e92d10afcae 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); |