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

Commit 798b1950 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Remove logic to ignore intents for CDMA phones" am: f3c67a19 am: d75a6925 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1640976

Change-Id: Ic8beef876e765a05e86093caf27d029f5f648036
parents 293c3eea d75a6925

src/java/com/android/internal/telephony/ServiceStateTracker.java

+0 −6
Original line number Diff line number Diff line
@@ -583,12 +583,6 @@ public class ServiceStateTracker extends Handler { 
                return;

            }



            // TODO: Remove this weird check left over from CDMA/GSM service state tracker merge.

            if (!mPhone.isPhoneTypeGsm()) {

                loge("Ignoring intent " + intent + " received on CDMA phone");

                return;

            }



            if (intent.getAction().equals(Intent.ACTION_LOCALE_CHANGED)) {

                // update emergency string whenever locale changed

                updateSpnDisplay();