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

Commit a205d4f5 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Check if cell identity type is valid " am: 3482bc94 am: 0189bf33 am: 831d1fd9 

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

Change-Id: I699844ada46759601bd8d8742da6e9948b9ab38c
parents 18e437de 831d1fd9

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

+2 −4
Original line number Diff line number Diff line
@@ -1132,8 +1132,8 @@ public class RadioIndication extends IRadioIndication.Stub { 
            @NetworkRegistrationInfo.Domain int domain,

            int causeCode, int additionalCauseCode) {

        mRil.processIndication(indicationType);



        if (cellIdentity == null

        CellIdentity ci = CellIdentity.create(cellIdentity);

        if (ci == null

                || TextUtils.isEmpty(chosenPlmn)

                || (domain & NetworkRegistrationInfo.DOMAIN_CS_PS) == 0

                || (domain & ~NetworkRegistrationInfo.DOMAIN_CS_PS) != 0
@@ -1147,8 +1147,6 @@ public class RadioIndication extends IRadioIndication.Stub { 
            return;

        }



        CellIdentity ci = CellIdentity.create(cellIdentity);



        mRil.mRegistrationFailedRegistrant.notifyRegistrant(

                new AsyncResult(

                        null,