Snap for 12667701 from 2ed72abe6de7b48284b1956f02e4aa92f27f9ce0 to 25Q1-release (fb7b39d3) · Commits · e / os / android_frameworks_opt_telephony

flags/carrier.aconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -21,3 +21,12 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		# OWNER=melhuishj TARGET=25Q2
		flag {
		name: "temporary_failures_in_carrier_messaging_service"
		is_exported: true
		namespace: "telephony"
		description: "Enable temporary failures in CarrierMessagingService"
		bug:"326610112"
		}

flags/misc.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -220,3 +220,13 @@ flag {
		}
		}

		# OWNER=jackyu TARGET=25Q2
		flag {
		name: "power_down_race_fix"
		namespace: "telephony"
		description: "Fixed race condition while powering down"
		bug:"378616116"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

flags/network.aconfig

+17 −0

Original line number	Diff line number	Diff line
		@@ -93,3 +93,20 @@ flag {
		}
		}

		# OWNER=yomna TARGET=25Q2
		flag {
		name: "security_algorithms_update_indications"
		is_exported: true
		namespace: "telephony"
		description: "guard system API onSecurityAlgorithmsChanged"
		bug: "355062720"
		}

		# OWNER=yomna TARGET=25Q2
		flag {
		name: "cellular_identifier_disclosure_indications"
		is_exported: true
		namespace: "telephony"
		description: "guard system API onCellularIdentifierDisclosedChanged"
		bug: "355062720"
		}

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -25,12 +25,14 @@ import android.telephony.BarringInfo;
		import android.telephony.CallQuality;
		import android.telephony.CellIdentity;
		import android.telephony.CellInfo;
		import android.telephony.CellularIdentifierDisclosure;
		import android.telephony.LinkCapacityEstimate;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.PhoneCapability;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.PreciseCallState;
		import android.telephony.PreciseDataConnectionState;
		import android.telephony.SecurityAlgorithmUpdate;
		import android.telephony.ServiceState;
		import android.telephony.TelephonyDisplayInfo;
		import android.telephony.TelephonyManager.DataEnabledReason;
		@@ -356,6 +358,23 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		sender.getSubId(), ntnSignalStrength);
		}

		@Override
		public void notifySecurityAlgorithmsChanged(Phone sender, SecurityAlgorithmUpdate update) {
		if (!mFeatureFlags.securityAlgorithmsUpdateIndications()) return;

		mTelephonyRegistryMgr.notifySecurityAlgorithmsChanged(sender.getPhoneId(),
		sender.getSubId(), update);
		}

		@Override
		public void notifyCellularIdentifierDisclosedChanged(Phone sender,
		CellularIdentifierDisclosure disclosure) {
		if (!mFeatureFlags.cellularIdentifierDisclosureIndications()) return;

		mTelephonyRegistryMgr.notifyCellularIdentifierDisclosedChanged(sender.getPhoneId(),
		sender.getSubId(), disclosure);
		}

		/**
		* Convert the {@link Call.State} enum into the PreciseCallState.PRECISE_CALL_STATE_* constants
		* for the public API.

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -1893,9 +1893,16 @@ public class GsmCdmaPhone extends Phone {
		@Override
		public void setRadioPowerForReason(boolean power, boolean forEmergencyCall,
		boolean isSelectedPhoneForEmergencyCall, boolean forceApply, int reason) {
		if (mFeatureFlags.powerDownRaceFix()) {
		// setRadioPowerForReason can be called by the binder thread. We need to move that into
		// the main thread to prevent race condition.
		post(() -> mSST.setRadioPowerForReason(power, forEmergencyCall,
		isSelectedPhoneForEmergencyCall, forceApply, reason));
		} else {
		mSST.setRadioPowerForReason(power, forEmergencyCall, isSelectedPhoneForEmergencyCall,
		forceApply, reason);
		}
		}

		@Override
		public Set<Integer> getRadioPowerOffReasons() {