Merge "Add a new field count_of_satellite_sessions into... (6de683d2) · Commits · e / os / android_frameworks_opt_telephony

proto/src/persist_atoms.proto

+1 −0

Original line number	Diff line number	Diff line
		@@ -839,6 +839,7 @@ message CarrierRoamingSatelliteControllerStats {
		optional int32 carrier_id = 8;
		optional bool is_device_entitled = 9;
		optional bool is_multi_sim = 10;
		optional int32 count_of_satellite_sessions = 11;
		}

		message SatelliteEntitlement {

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1612,7 +1612,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		stats.satelliteSessionGapMaxSec,
		stats.carrierId,
		stats.isDeviceEntitled,
		stats.isMultiSim);
		stats.isMultiSim,
		stats.countOfSatelliteSessions);
		}

		private static StatsEvent buildStatsEvent(SatelliteEntitlement stats) {

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -886,6 +886,7 @@ public class PersistAtomsStorage {
		// dimension fields.
		existingStats.isDeviceEntitled = stats.isDeviceEntitled;
		existingStats.isMultiSim = stats.isMultiSim;
		existingStats.countOfSatelliteSessions += stats.countOfSatelliteSessions;
		} else {
		mAtoms.carrierRoamingSatelliteControllerStats = insertAtRandomPlace(
		mAtoms.carrierRoamingSatelliteControllerStats, stats, mMaxNumSatelliteStats);

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -2138,6 +2138,7 @@ public class SatelliteStats {
		private static int sCarrierId;
		private static boolean sIsDeviceEntitled;
		private static boolean sIsMultiSim;
		private final int mCountOfSatelliteSessions;

		private CarrierRoamingSatelliteControllerStatsParams(Builder builder) {
		this.mConfigDataSource = builder.mConfigDataSource;
		@@ -2173,6 +2174,8 @@ public class SatelliteStats {
		if (builder.mIsMultiSim.isPresent()) {
		sIsMultiSim = builder.mIsMultiSim.get();
		}

		this.mCountOfSatelliteSessions = builder.mCountOfSatelliteSessions;
		}

		public int getConfigDataSource() {
		@@ -2216,6 +2219,10 @@ public class SatelliteStats {
		return sIsMultiSim;
		}

		public int getCountOfSatelliteSessions() {
		return mCountOfSatelliteSessions;
		}

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

		/**
		* Sets configDataSource value of {@link CarrierRoamingSatelliteControllerStats} atom
		@@ -2316,6 +2324,15 @@ public class SatelliteStats {
		return this;
		}

		/**
		* Increase the countOfSatelliteSession value of
		* {@link CarrierRoamingSatelliteControllerStats} atom by one then returns Builder class
		*/
		public Builder increaseCountOfSatelliteSessions() {
		this.mCountOfSatelliteSessions++;
		return this;
		}

		/**
		* Returns CarrierRoamingSatelliteControllerStatsParams, which contains whole component
		* of {@link CarrierRoamingSatelliteControllerStats} atom
		@@ -2342,6 +2359,7 @@ public class SatelliteStats {
		+ ", carrierId=" + sCarrierId
		+ ", isDeviceEntitled=" + sIsDeviceEntitled
		+ ", isMultiSim=" + sIsMultiSim
		+ ", countOfSatelliteSession=" + mCountOfSatelliteSessions
		+ ")";
		}
		}
		@@ -3008,6 +3026,7 @@ public class SatelliteStats {
		proto.carrierId = param.getCarrierId();
		proto.isDeviceEntitled = param.isDeviceEntitled();
		proto.isMultiSim = param.isMultiSim();
		proto.countOfSatelliteSessions = param.getCountOfSatelliteSessions();
		if (DBG) logd("onCarrierRoamingSatelliteControllerStatsMetrics: " + param);
		mAtomsStorage.addCarrierRoamingSatelliteControllerStats(proto);
		}

src/java/com/android/internal/telephony/satellite/metrics/CarrierRoamingSatelliteControllerStats.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,10 @@ public class CarrierRoamingSatelliteControllerStats {
		/** Log carrier roaming satellite session start */
		public void onSessionStart() {
		mSessionStartTimeList.add(getCurrentTime());
		mSatelliteStats.onCarrierRoamingSatelliteControllerStatsMetrics(
		new SatelliteStats.CarrierRoamingSatelliteControllerStatsParams.Builder()
		.increaseCountOfSatelliteSessions()
		.build());
		}

		/** Log carrier roaming satellite session end */