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

Commit 208065d4 authored by Sangyun Yun's avatar Sangyun Yun Committed by Automerger Merge Worker
Browse files

Merge "Use AnomalyReport without carrier ID to avoid deadlock." into udc-dev am: da4f130d 

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



Change-Id: I5128516fda9ceb824f374e5be963b129d060dd58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a7f018d da4f130d

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

+5 −11
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.internal.telephony;



import static android.telephony.TelephonyManager.HAL_SERVICE_RADIO;

import static android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID;



import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CALL_RING;

import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CARRIER_INFO_IMSI_ENCRYPTION;
@@ -1133,7 +1132,7 @@ public class RadioIndication extends IRadioIndication.Stub { 
                || (domain & ~NetworkRegistrationInfo.DOMAIN_CS_PS) != 0

                || causeCode < 0 || additionalCauseCode < 0

                || (causeCode == Integer.MAX_VALUE && additionalCauseCode == Integer.MAX_VALUE)) {

            reportAnomaly(

            AnomalyReporter.reportAnomaly(

                    UUID.fromString("f16e5703-6105-4341-9eb3-e68189156eb4"),

                            "Invalid registrationFailed indication");
@@ -1159,7 +1158,7 @@ public class RadioIndication extends IRadioIndication.Stub { 
        mRil.processIndication(HAL_SERVICE_RADIO, indicationType);



        if (cellIdentity == null || barringInfos == null) {

            reportAnomaly(

            AnomalyReporter.reportAnomaly(

                    UUID.fromString("645b16bb-c930-4c1c-9c5d-568696542e05"),

                            "Invalid barringInfoChanged indication");
@@ -1264,7 +1263,8 @@ public class RadioIndication extends IRadioIndication.Stub { 
                }

            }

        } catch (IllegalArgumentException iae) {

            reportAnomaly(UUID.fromString("918f0970-9aa9-4bcd-a28e-e49a83fe77d5"),

            AnomalyReporter.reportAnomaly(

                    UUID.fromString("918f0970-9aa9-4bcd-a28e-e49a83fe77d5"),

                            "RIL reported invalid PCC (HIDL)");

            mRil.riljLoge("Invalid PhysicalChannelConfig " + iae);

            return;
@@ -1349,10 +1349,4 @@ public class RadioIndication extends IRadioIndication.Stub { 
        mRil.mApnUnthrottledRegistrants.notifyRegistrants(

                new AsyncResult(null, apn, null));

    }



    private void reportAnomaly(UUID uuid, String msg) {

        Phone phone = mRil.mPhoneId == null ? null : PhoneFactory.getPhone(mRil.mPhoneId);

        int carrierId = phone == null ? UNKNOWN_CARRIER_ID : phone.getCarrierId();

        AnomalyReporter.reportAnomaly(uuid, msg, carrierId);

    }

}