Merge "Add missing call to mNotifier for transparency APIs into GsmCdmaPhone" into main (32dcb50f) · Commits · e / os / android_frameworks_opt_telephony

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

+17 −2

Original line number	Diff line number	Diff line
		@@ -3775,6 +3775,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:
		@@ -3785,13 +3792,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: