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

Commit 368dfaa5 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 1cfad3b6 656f2817

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2060,4 +2060,6 @@ 
    <!-- Support for disabling to fetch APN from OMH card

         for some cdma carriers -->

    <bool name="config_fetch_apn_from_omh_card">true</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
@@ -2199,4 +2199,7 @@ 
  <java-symbol type="integer" name="launchboost_ksmboost_param" />



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

  <!-- 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
@@ -1856,7 +1856,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 ||