Snap for 12335440 from e85adb1b0c82a379e3ed0a20bfb1f60f7aeff24e to 24Q4-release (2825bb91) · Commits · e / os / android_frameworks_opt_telephony

flags/misc.aconfig

+0 −22

Original line number	Diff line number	Diff line
		@@ -96,28 +96,6 @@ flag {
		bug:"271921464"
		}

		# OWNER=rambowang TARGET=24Q3
		flag {
		name: "fix_crash_on_getting_config_when_phone_is_gone"
		namespace: "telephony"
		description: "Fix VCN crash when calling CarrierConfigManager.getConfigForSubId while phone process has gone."
		bug:"319791612"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		# OWNER=rambowang TARGET=24Q3
		flag {
		name: "add_anomaly_when_notify_config_changed_with_invalid_phone"
		namespace: "telephony"
		description: "Report anomaly when CarrierConfigLoader received config change with sub that maps to invalid phoneId"
		bug:"270757342"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		# OWNER=sangyun TARGET=24Q3
		flag {
		name: "roaming_notification_for_single_data_network"

proto/src/persist_atoms.proto

+10 −0

Original line number	Diff line number	Diff line
		@@ -719,6 +719,7 @@ message SatelliteController {
		optional int32 count_of_disallowed_satellite_access = 27;
		optional int32 count_of_satellite_access_check_fail = 28;
		optional bool is_provisioned = 29;
		optional int32 carrier_id = 30;
		}

		message SatelliteSession {
		@@ -735,6 +736,10 @@ message SatelliteSession {
		optional int32 count_of_incoming_datagram_failed = 11;
		optional bool is_demo_mode = 12;
		optional int32 max_ntn_signal_strength_level = 13;
		optional int32 carrier_id = 14;
		optional int32 count_of_satellite_notification_displayed = 15;
		optional int32 count_of_auto_exit_due_to_screen_off = 16;
		optional int32 count_of_auto_exit_due_to_tn_network = 17;
		}

		message SatelliteIncomingDatagram {
		@@ -742,6 +747,7 @@ message SatelliteIncomingDatagram {
		optional int32 datagram_size_bytes = 2;
		optional int64 datagram_transfer_time_millis = 3;
		optional bool is_demo_mode = 4;
		optional int32 carrier_id = 5;
		}

		message SatelliteOutgoingDatagram {
		@@ -750,6 +756,7 @@ message SatelliteOutgoingDatagram {
		optional int32 datagram_size_bytes = 3;
		optional int64 datagram_transfer_time_millis = 4;
		optional bool is_demo_mode = 5;
		optional int32 carrier_id = 6;
		}

		message SatelliteProvision {
		@@ -757,6 +764,7 @@ message SatelliteProvision {
		optional int32 provisioning_time_sec = 2;
		optional bool is_provision_request = 3;
		optional bool is_canceled = 4;
		optional int32 carrier_id = 5;
		}

		message SatelliteSosMessageRecommender {
		@@ -809,6 +817,7 @@ message CarrierRoamingSatelliteControllerStats {
		optional int32 satellite_session_gap_min_sec = 5;
		optional int32 satellite_session_gap_avg_sec = 6;
		optional int32 satellite_session_gap_max_sec = 7;
		optional int32 carrier_id = 8;
		}

		message SatelliteEntitlement {
		@@ -836,4 +845,5 @@ message SatelliteAccessController {
		optional int32 result_code = 7;
		repeated string country_codes = 8;
		optional int32 config_data_source = 9;
		optional int32 carrier_id = 10;
		}

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

+10 −4

Original line number	Diff line number	Diff line
		@@ -1047,10 +1047,16 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}
		} else {
		mDisabledRadioServices.get(service).add(mPhoneId);
		if (isRadioServiceSupported(service)) {
		mHalVersion.put(service, RADIO_HAL_VERSION_UNKNOWN);
		riljLoge("getRadioServiceProxy: set " + serviceToString(service) + " for "
		+ HIDL_SERVICE_NAME[mPhoneId] + " as disabled\n"
		+ android.util.Log.getStackTraceString(new RuntimeException()));
		} else {
		mHalVersion.put(service, RADIO_HAL_VERSION_UNSUPPORTED);
		riljLog("getRadioServiceProxy: set " + serviceToString(service) + " for "
		+ HIDL_SERVICE_NAME[mPhoneId] + " as disabled (unsupported)");
		}
		}
		}
		} catch (RemoteException e) {

src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,7 @@ public class CarrierDisplayNameResolver {

		return new CarrierDisplayNameData.Builder()
		.setSpn(spn)
		.setDataSpn(spn)
		.setShowSpn(showSpn)
		.setPlmn(plmn)
		.setShowPlmn(showPlmn)

src/java/com/android/internal/telephony/metrics/MetricsCollector.java

+17 −7

Original line number	Diff line number	Diff line
		@@ -1476,7 +1476,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		satelliteController.countOfAllowedSatelliteAccess,
		satelliteController.countOfDisallowedSatelliteAccess,
		satelliteController.countOfSatelliteAccessCheckFail,
		satelliteController.isProvisioned);
		satelliteController.isProvisioned,
		satelliteController.carrierId);
		}

		private static StatsEvent buildStatsEvent(SatelliteSession satelliteSession) {
		@@ -1494,7 +1495,11 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		satelliteSession.countOfIncomingDatagramSuccess,
		satelliteSession.countOfIncomingDatagramFailed,
		satelliteSession.isDemoMode,
		satelliteSession.maxNtnSignalStrengthLevel);
		satelliteSession.maxNtnSignalStrengthLevel,
		satelliteSession.carrierId,
		satelliteSession.countOfSatelliteNotificationDisplayed,
		satelliteSession.countOfAutoExitDueToScreenOff,
		satelliteSession.countOfAutoExitDueToTnNetwork);
		}

		private static StatsEvent buildStatsEvent(SatelliteIncomingDatagram stats) {
		@@ -1503,7 +1508,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		stats.resultCode,
		stats.datagramSizeBytes,
		stats.datagramTransferTimeMillis,
		stats.isDemoMode);
		stats.isDemoMode,
		stats.carrierId);
		}

		private static StatsEvent buildStatsEvent(SatelliteOutgoingDatagram stats) {
		@@ -1513,7 +1519,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		stats.resultCode,
		stats.datagramSizeBytes,
		stats.datagramTransferTimeMillis,
		stats.isDemoMode);
		stats.isDemoMode,
		stats.carrierId);
		}

		private static StatsEvent buildStatsEvent(SatelliteProvision stats) {
		@@ -1522,7 +1529,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		stats.resultCode,
		stats.provisioningTimeSec,
		stats.isProvisionRequest,
		stats.isCanceled);
		stats.isCanceled,
		stats.carrierId);
		}

		private static StatsEvent buildStatsEvent(SatelliteSosMessageRecommender stats) {
		@@ -1582,7 +1590,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		stats.countOfSatelliteNotificationDisplayed,
		stats.satelliteSessionGapMinSec,
		stats.satelliteSessionGapAvgSec,
		stats.satelliteSessionGapMaxSec);
		stats.satelliteSessionGapMaxSec,
		stats.carrierId);
		}

		private static StatsEvent buildStatsEvent(SatelliteEntitlement stats) {
		@@ -1614,7 +1623,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		stats.isEmergency,
		stats.resultCode,
		stats.countryCodes,
		stats.configDataSource);
		stats.configDataSource,
		stats.carrierId);
		}

		/** Returns all phones in {@link PhoneFactory}, or an empty array if phones not made yet. */