Merge "Add is_nb_iot_ntn field into related atoms" into main (6c0cfefa) · Commits · e / os / android_frameworks_opt_telephony

proto/src/persist_atoms.proto

+6 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,7 @@ message IncomingSms {
		optional bool is_managed_profile = 16;
		optional bool is_ntn = 17;
		optional bool is_emergency = 18;
		optional bool is_nb_iot_ntn = 19;

		// Internal use only
		optional int32 hashCode = 10001;
		@@ -379,6 +380,7 @@ message OutgoingSms {
		optional bool is_emergency = 19;
		optional bool is_ntn = 20;
		optional bool is_mt_sms_polling = 21;
		optional bool is_nb_iot_ntn = 22;

		// Internal use only
		optional int32 hashCode = 10001;
		@@ -418,6 +420,7 @@ message DataCallSession {
		optional bool is_ntn = 24;
		optional bool is_satellite_transport = 25;
		optional bool is_provisioning_profile = 26;
		optional bool is_nb_iot_ntn = 27;
		}

		message CellularServiceState {
		@@ -437,6 +440,7 @@ message CellularServiceState {
		optional bool isDataEnabled = 14;
		optional bool is_iwlan_cross_sim = 15;
		optional bool is_ntn = 16;
		optional bool is_nb_iot_ntn = 17;

		// Internal use only
		optional int64 last_used_millis = 10001;
		@@ -832,6 +836,7 @@ message CarrierRoamingSatelliteSession {
		optional int32 service_data_policy = 18;
		optional int64 satellite_data_consumed_bytes = 19;
		optional bool is_multi_sim = 20;
		optional bool is_nb_iot_ntn = 21;
		}

		message CarrierRoamingSatelliteControllerStats {
		@@ -846,6 +851,7 @@ message CarrierRoamingSatelliteControllerStats {
		optional bool is_device_entitled = 9;
		optional bool is_multi_sim = 10;
		optional int32 count_of_satellite_sessions = 11;
		optional bool is_nb_iot_ntn = 12;
		}

		message SatelliteEntitlement {

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -310,6 +310,7 @@ public class DataCallSessionStats {
		copy.isNtn = call.isNtn;
		copy.isSatelliteTransport = call.isSatelliteTransport;
		copy.isProvisioningProfile = call.isProvisioningProfile;
		copy.isNbIotNtn = call.isNbIotNtn;
		return copy;
		}

		@@ -337,8 +338,13 @@ public class DataCallSessionStats {
		proto.handoverFailureRat = new int[0];
		proto.isNonDds = false;
		proto.isIwlanCrossSim = false;
		proto.isNtn = mSatelliteController != null
		? mSatelliteController.isInSatelliteModeForCarrierRoaming(mPhone) : false;
		if (mSatelliteController != null) {
		proto.isNtn = mSatelliteController.isInSatelliteModeForCarrierRoaming(mPhone);
		proto.isNbIotNtn = mSatelliteController.isInCarrierRoamingNbIotNtn(mPhone);
		} else {
		proto.isNtn = false;
		proto.isNbIotNtn = false;
		}
		proto.isSatelliteTransport = isSatellite;
		proto.isProvisioningProfile = getIsProvisioningProfile();
		return proto;

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

+12 −6

Original line number	Diff line number	Diff line
		@@ -1086,7 +1086,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		state.overrideVoiceService,
		state.isDataEnabled,
		state.isIwlanCrossSim,
		state.isNtn);
		state.isNtn,
		state.isNbIotNtn);
		}

		private static StatsEvent buildStatsEvent(VoiceCallRatUsage usage) {
		@@ -1172,7 +1173,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		sms.count,
		sms.isManagedProfile,
		sms.isNtn,
		sms.isEmergency);
		sms.isEmergency,
		sms.isNbIotNtn);
		}

		private static StatsEvent buildStatsEvent(OutgoingSms sms) {
		@@ -1198,7 +1200,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		sms.isManagedProfile,
		sms.isEmergency,
		sms.isNtn,
		sms.isMtSmsPolling);
		sms.isMtSmsPolling,
		sms.isNbIotNtn);
		}

		private static StatsEvent buildStatsEvent(DataCallSession dataCallSession) {
		@@ -1230,7 +1233,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		dataCallSession.isIwlanCrossSim,
		dataCallSession.isNtn,
		dataCallSession.isSatelliteTransport,
		dataCallSession.isProvisioningProfile);
		dataCallSession.isProvisioningProfile,
		dataCallSession.isNbIotNtn);
		}

		private static StatsEvent buildStatsEvent(ImsRegistrationStats stats) {
		@@ -1603,7 +1607,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		stats.supportedSatelliteServices,
		stats.serviceDataPolicy,
		stats.satelliteDataConsumedBytes,
		stats.isMultiSim);
		stats.isMultiSim,
		stats.isNbIotNtn);
		}

		private static StatsEvent buildStatsEvent(CarrierRoamingSatelliteControllerStats stats) {
		@@ -1619,7 +1624,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		stats.carrierId,
		stats.isDeviceEntitled,
		stats.isMultiSim,
		stats.countOfSatelliteSessions);
		stats.countOfSatelliteSessions,
		stats.isNbIotNtn);
		}

		private static StatsEvent buildStatsEvent(SatelliteEntitlement stats) {

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -899,6 +899,7 @@ public class PersistAtomsStorage {
		existingStats.isDeviceEntitled = stats.isDeviceEntitled;
		existingStats.isMultiSim = stats.isMultiSim;
		existingStats.countOfSatelliteSessions += stats.countOfSatelliteSessions;
		existingStats.isNbIotNtn = stats.isNbIotNtn;
		} else {
		mAtoms.carrierRoamingSatelliteControllerStats = insertAtRandomPlace(
		mAtoms.carrierRoamingSatelliteControllerStats, stats, mMaxNumSatelliteStats);
		@@ -2011,7 +2012,8 @@ public class PersistAtomsStorage {
		&& state.overrideVoiceService == key.overrideVoiceService
		&& state.isDataEnabled == key.isDataEnabled
		&& state.isIwlanCrossSim == key.isIwlanCrossSim
		&& state.isNtn == key.isNtn) {
		&& state.isNtn == key.isNtn
		&& state.isNbIotNtn == key.isNbIotNtn) {
		return state;
		}
		}
		@@ -2442,9 +2444,7 @@ public class PersistAtomsStorage {
		CarrierRoamingSatelliteControllerStats key) {
		for (CarrierRoamingSatelliteControllerStats stats :
		mAtoms.carrierRoamingSatelliteControllerStats) {
		if (stats.carrierId == key.carrierId
		&& stats.configDataSource == key.configDataSource
		&& stats.isDeviceEntitled == key.isDeviceEntitled) {
		if (stats.carrierId == key.carrierId) {
		return stats;
		}
		}

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

+40 −2

Original line number	Diff line number	Diff line
		@@ -1886,6 +1886,7 @@ public class SatelliteStats {
		private final int mServiceDataPolicy;
		private final long mSatelliteDataConsumedBytes;
		private final boolean mIsMultiSim;
		private final boolean mIsNbIotNtn;

		private CarrierRoamingSatelliteSessionParams(Builder builder) {
		this.mCarrierId = builder.mCarrierId;
		@@ -1910,6 +1911,7 @@ public class SatelliteStats {
		this.mSatelliteDataConsumedBytes =
		builder.mSatelliteDataConsumedBytes;
		this.mIsMultiSim = builder.mIsMultiSim;
		this.mIsNbIotNtn = builder.mIsNbIotNtn;
		}

		public int getCarrierId() {
		@@ -1992,6 +1994,10 @@ public class SatelliteStats {
		return mIsMultiSim;
		}

		public boolean isNbIotNtn() {
		return mIsNbIotNtn;
		}

		/**
		* A builder class to create {@link CarrierRoamingSatelliteSessionParams} data structure
		* class
		@@ -2018,6 +2024,7 @@ public class SatelliteStats {
		SatelliteConstants.SATELLITE_ENTITLEMENT_SERVICE_POLICY_UNKNOWN;
		long mSatelliteDataConsumedBytes = 0L;
		private boolean mIsMultiSim = false;
		private boolean mIsNbIotNtn = false;

		/**
		* Sets carrierId value of {@link CarrierRoamingSatelliteSession} atom
		@@ -2212,6 +2219,15 @@ public class SatelliteStats {
		return new SatelliteStats()
		.new CarrierRoamingSatelliteSessionParams(Builder.this);
		}

		/**
		* Sets isNbIotNtn value of {@link CarrierRoamingSatelliteSession} atom, which indicates
		* whether satellite service tech is NB-IoT-NTN or not
		*/
		public Builder setIsNbIotNtn(boolean isNbIotNtn) {
		this.mIsNbIotNtn = isNbIotNtn;
		return this;
		}
		}

		@Override
		@@ -2238,6 +2254,7 @@ public class SatelliteStats {
		+ ", serviceDataPolicy=" + mServiceDataPolicy
		+ ", SatelliteDataConsumedBytes=" + mSatelliteDataConsumedBytes
		+ ", isMultiSim=" + mIsMultiSim
		+ ", isNbIotNtn=" + mIsNbIotNtn
		+ ")";
		}
		}
		@@ -2259,6 +2276,7 @@ public class SatelliteStats {
		private static boolean sIsDeviceEntitled;
		private static boolean sIsMultiSim;
		private final int mCountOfSatelliteSessions;
		private static boolean sIsNbIotNtn;

		private CarrierRoamingSatelliteControllerStatsParams(Builder builder) {
		this.mConfigDataSource = builder.mConfigDataSource;
		@@ -2296,6 +2314,11 @@ public class SatelliteStats {
		}

		this.mCountOfSatelliteSessions = builder.mCountOfSatelliteSessions;

		// isNbIotNtn value should be updated only when it is meaningful.
		if (builder.mIsNbIotNtn.isPresent()) {
		sIsNbIotNtn = builder.mIsNbIotNtn.get();
		}
		}

		public int getConfigDataSource() {
		@@ -2342,6 +2365,10 @@ public class SatelliteStats {
		return mCountOfSatelliteSessions;
		}

		public boolean isNbIotNtn() {
		return sIsNbIotNtn;
		}

		/**
		* A builder class to create {@link CarrierRoamingSatelliteControllerStatsParams}
		* data structure class
		@@ -2358,6 +2385,7 @@ public class SatelliteStats {
		private Optional<Boolean> mIsDeviceEntitled = Optional.empty();
		private Optional<Boolean> mIsMultiSim = Optional.empty();
		private int mCountOfSatelliteSessions = 0;
		private Optional<Boolean> mIsNbIotNtn = Optional.empty();

		/**
		* Sets configDataSource value of {@link CarrierRoamingSatelliteControllerStats} atom
		@@ -2452,6 +2480,12 @@ public class SatelliteStats {
		return this;
		}

		/** Sets whether the device is in NB-NoT-NTN state or not. */
		public Builder setIsNbIotNtn(boolean isNbIotNtn) {
		this.mIsNbIotNtn = Optional.of(isNbIotNtn);
		return this;
		}

		/**
		* Returns CarrierRoamingSatelliteControllerStatsParams, which contains whole component
		* of {@link CarrierRoamingSatelliteControllerStats} atom
		@@ -2481,7 +2515,8 @@ public class SatelliteStats {
		&& sCarrierId == that.getCarrierId()
		&& sIsDeviceEntitled == that.isDeviceEntitled()
		&& sIsMultiSim == that.isMultiSim()
		&& mCountOfSatelliteSessions == that.getCountOfSatelliteSessions();
		&& mCountOfSatelliteSessions == that.getCountOfSatelliteSessions()
		&& sIsNbIotNtn == that.isNbIotNtn();
		}

		@Override
		@@ -2490,7 +2525,7 @@ public class SatelliteStats {
		mCountOfSatelliteConfigUpdateRequest, mCountOfSatelliteNotificationDisplayed,
		sSatelliteSessionGapMinSec, sSatelliteSessionGapAvgSec,
		sSatelliteSessionGapMaxSec, sCarrierId, sIsDeviceEntitled, sIsMultiSim,
		mCountOfSatelliteSessions);
		mCountOfSatelliteSessions, sIsNbIotNtn);
		}

		@Override
		@@ -2510,6 +2545,7 @@ public class SatelliteStats {
		+ ", isDeviceEntitled=" + sIsDeviceEntitled
		+ ", isMultiSim=" + sIsMultiSim
		+ ", countOfSatelliteSession=" + mCountOfSatelliteSessions
		+ ", isNbIotNtn=" + sIsNbIotNtn
		+ ")";
		}
		}
		@@ -3169,6 +3205,7 @@ public class SatelliteStats {
		proto.serviceDataPolicy = param.mServiceDataPolicy;
		proto.satelliteDataConsumedBytes = param.mSatelliteDataConsumedBytes;
		proto.isMultiSim = param.isMultiSim();
		proto.isNbIotNtn = param.isNbIotNtn();
		if (DBG) logd("onCarrierRoamingSatelliteSessionMetrics: " + param);
		mAtomsStorage.addCarrierRoamingSatelliteSessionStats(proto);
		}
		@@ -3188,6 +3225,7 @@ public class SatelliteStats {
		proto.isDeviceEntitled = param.isDeviceEntitled();
		proto.isMultiSim = param.isMultiSim();
		proto.countOfSatelliteSessions = param.getCountOfSatelliteSessions();
		proto.isNbIotNtn = param.isNbIotNtn();
		if (DBG) logd("onCarrierRoamingSatelliteControllerStatsMetrics: " + param);
		mAtomsStorage.addCarrierRoamingSatelliteControllerStats(proto);
		}