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

Unverified Commit 8f387217 authored by Danny Baumann's avatar Danny Baumann Committed by Michael Bestas
Browse files

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

This reverts commit 2e0f4191.

Change-Id: Iaad6a2e3ccb6f9edcd4e7014fd55bef5cc14ae1f
parent 98e86b50

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

+1 −14
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ import android.os.IInterface; 
import android.os.Looper;

import android.os.Message;

import android.os.Parcelable;

import android.os.PersistableBundle;

import android.os.Process;

import android.os.RemoteException;

import android.os.SystemClock;
@@ -116,7 +115,6 @@ import android.service.notification.NotificationListenerService; 
import android.service.notification.NotificationRankingUpdate;

import android.service.notification.StatusBarNotification;

import android.service.notification.ZenModeConfig;

import android.telephony.CarrierConfigManager;

import android.telephony.PhoneStateListener;

import android.telephony.TelephonyManager;

import android.text.TextUtils;
@@ -341,8 +339,6 @@ public class NotificationManagerService extends SystemService { 
    private RankingHandler mRankingHandler;

    private long mLastOverRateLogTime;

    private float mMaxPackageEnqueueRate = DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE;

    private PersistableBundle mCarrierConfig;

    private CarrierConfigManager mConfigManager;

    private String mSystemNotificationSound;



    private static class Archive {
@@ -1229,8 +1225,6 @@ public class NotificationManagerService extends SystemService { 


        publishBinderService(Context.NOTIFICATION_SERVICE, mService);

        publishLocalService(NotificationManagerInternal.class, mInternalService);

        mConfigManager = (CarrierConfigManager)

                getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

    }



    private void sendRegisteredOnlyBroadcast(String action) {
@@ -2990,14 +2984,7 @@ public class NotificationManagerService extends SystemService { 
        boolean hasValidVibrate = false;

        boolean hasValidSound = false;



        boolean smsRingtone =  false;

        if (mCarrierConfig == null) {

            mCarrierConfig = mConfigManager.getConfig();

        } else {

            smsRingtone = mCarrierConfig.getBoolean(

                CarrierConfigManager.KEY_CONFIG_SMS_RINGTONE_INCALL);

        }

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

        if (disableEffects == null

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

                    record.getUserId() == currentUser ||

                    mUserProfiles.isCurrentProfile(record.getUserId()))

telephony/java/android/telephony/CarrierConfigManager.java

+0 −7
Original line number Diff line number Diff line
@@ -871,12 +871,6 @@ public class CarrierConfigManager { 
    public static final String KEY_MAP_ANONYMOUS_TO_RESTRICTED_BOOL =

            "carrier_map_anonymous_to_restricted";



    /**

     * Configuration to play sms ringtone during MO/MT call.

     * @hide

     */

    public static final String KEY_CONFIG_SMS_RINGTONE_INCALL = "config_sms_ringtone_incall";



    /**

     * Report IMEI as device id even if it's a CDMA/LTE phone.

     *
@@ -1198,7 +1192,6 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);

        sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);

        sDefaults.putBoolean(KEY_MAP_ANONYMOUS_TO_RESTRICTED_BOOL, true);

        sDefaults.putBoolean(KEY_CONFIG_SMS_RINGTONE_INCALL, true);

    }



    /**