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

Commit 450a6912 authored by yomna's avatar yomna
Browse files

Add missing call to mNotifier for transparency APIs into GsmCdmaPhone 

In order to support exposing updates from the HAL into the TelephonyCallback APIs, when the
relevant events are handled from the modem, the respective methods from PhoneNotifier must be
called.

Bug: 380752751
Test: atest CtsTelephonyTestCases:CellularSecurityCallbackTest GsmCdmaPhoneTest
Flag: com.android.internal.telephony.flags.security_algorithms_update_indications
Flag: com.android.internal.telephony.flags.cellular_identifier_disclosure_indications
Change-Id: I85e464b960df7369855a16c0645e1798c13da5d6
parent a8c92455

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

+17 −2
Original line number Diff line number Diff line
@@ -3770,6 +3770,13 @@ public class GsmCdmaPhone extends Phone { 
                        && disclosure != null) {

                    mIdentifierDisclosureNotifier.addDisclosure(mContext, getSubId(), disclosure);

                }

                if (mFeatureFlags.cellularIdentifierDisclosureIndications()

                        && mIdentifierDisclosureNotifier != null

                        && disclosure != null) {

                    logd("EVENT_CELL_IDENTIFIER_DISCLOSURE for non-Safety Center listeners "

                            + "phoneId = " + getPhoneId());

                    mNotifier.notifyCellularIdentifierDisclosedChanged(this, disclosure);

                }

                break;



            case EVENT_SET_IDENTIFIER_DISCLOSURE_ENABLED_DONE:
@@ -3780,13 +3787,21 @@ public class GsmCdmaPhone extends Phone { 


            case EVENT_SECURITY_ALGORITHM_UPDATE:

                logd("EVENT_SECURITY_ALGORITHM_UPDATE phoneId = " + getPhoneId());

                if (mFeatureFlags.enableModemCipherTransparencyUnsolEvents()

                        && mNullCipherNotifier != null) {



                ar = (AsyncResult) msg.obj;

                SecurityAlgorithmUpdate update = (SecurityAlgorithmUpdate) ar.result;



                if (mFeatureFlags.enableModemCipherTransparencyUnsolEvents()

                        && mNullCipherNotifier != null) {

                    mNullCipherNotifier.onSecurityAlgorithmUpdate(mContext, getPhoneId(),

                            getSubId(), update);

                }

                if (mFeatureFlags.securityAlgorithmsUpdateIndications()

                        && mNullCipherNotifier != null) {

                    logd("EVENT_SECURITY_ALGORITHM_UPDATE for non-Safety Center listeners "

                              + "phoneId = " + getPhoneId());

                    mNotifier.notifySecurityAlgorithmsChanged(this, update);

                }

                break;



            case EVENT_SET_SECURITY_ALGORITHMS_UPDATED_ENABLED_DONE: