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

Commit 9508f916 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Mms: Fix no ringtone for MT SMS during the call"

parents fd2e55d8 ed0aac85

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2111,4 +2111,6 @@ 


   <!-- Should the device show AM/PM in unlock screen -->

   <bool name="config_show_ampm_in_unlock_screen">false</bool>

   <!-- Configuration to play sms ringtone during MO/MT call -->

   <bool name="config_sms_ringtone_incall">false</bool>

</resources>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -2233,4 +2233,7 @@ 
  <java-symbol type="bool" name="config_show_ampm_in_unlock_screen" />

  <!-- for wifi auto connection -->

  <java-symbol type="bool" name="wifi_autocon" />



  <!-- Configuration to play sms ringtone during MO/MT call -->

  <java-symbol type="bool" name="config_sms_ringtone_incall" />

</resources>

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

+3 −1
Original line number Diff line number Diff line
@@ -1870,7 +1870,9 @@ public class NotificationManagerService extends SystemService { 
        if (disableEffects != null) {

            ZenLog.traceDisableEffects(record, disableEffects);

        }

        if (disableEffects == null

        boolean smsRingtone = getContext().getResources().getBoolean(

                com.android.internal.R.bool.config_sms_ringtone_incall);

        if ((disableEffects == null || (smsRingtone && mInCall))

                && (!(record.isUpdate

                    && (notification.flags & Notification.FLAG_ONLY_ALERT_ONCE) != 0 ))

                && (record.getUserId() == UserHandle.USER_ALL ||