Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20464662 authored by Beverly's avatar Beverly Committed by android-build-merger
Browse files

Merge "In-call-notif doesn't use AUDIBILITY_ENFORCED flag" into oc-mr1-dev 

am: 19862618

Change-Id: I79e08d9cbfce62b6e4c668858e1bf366760cd969
parents 0397bc70 19862618

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

services/core/java/com/android/server/notification/NotificationManagerService.java

+0 −2
Original line number Diff line number Diff line
@@ -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);