Merge "[Satellite] Enhanced the satellite metrics to record datagram count per... (52588fa4) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/satellite/SatelliteManager.java

+30 −10

Original line number	Diff line number	Diff line
		@@ -219,6 +219,14 @@ public final class SatelliteManager {

		public static final String KEY_SESSION_STATS = "session_stats";

		/**
		* Bundle key to get the response from
		* {@link #requestSessionStats(Executor, OutcomeReceiver)}.
		* @hide
		*/

		public static final String KEY_SESSION_STATS_V2 = "session_stats_v2";

		/**
		* Bundle key to get the response from
		* {@link #requestIsProvisioned(Executor, OutcomeReceiver)}.
		@@ -3468,21 +3476,33 @@ public final class SatelliteManager {
		@Override
		protected void onReceiveResult(int resultCode, Bundle resultData) {
		if (resultCode == SATELLITE_RESULT_SUCCESS) {
		SatelliteSessionStats stats;
		if (resultData.containsKey(KEY_SESSION_STATS)) {
		SatelliteSessionStats stats =
		resultData.getParcelable(KEY_SESSION_STATS,
		stats = resultData.getParcelable(KEY_SESSION_STATS,
		SatelliteSessionStats.class);
		executor.execute(() -> Binder.withCleanCallingIdentity(() ->
		callback.onResult(stats)));
		if (resultData.containsKey(KEY_SESSION_STATS_V2)) {
		SatelliteSessionStats stats1 = resultData.getParcelable(
		KEY_SESSION_STATS_V2, SatelliteSessionStats.class);
		if (stats != null && stats1 != null) {
		stats.setSatelliteSessionStats(
		stats1.getSatelliteSessionStats());
		executor.execute(() -> Binder.withCleanCallingIdentity(
		() -> callback.onResult(stats)));
		return;
		}
		} else {
		loge("KEY_SESSION_STATS_V2 does not exist.");
		}
		} else {
		loge("KEY_SESSION_STATS does not exist.");
		executor.execute(() -> Binder.withCleanCallingIdentity(() ->
		callback.onError(new SatelliteException(
		SATELLITE_RESULT_REQUEST_FAILED))));
		}
		executor.execute(() -> Binder.withCleanCallingIdentity(
		() -> callback.onError(new SatelliteException(
		SATELLITE_RESULT_REQUEST_FAILED))));

		} else {
		executor.execute(() -> Binder.withCleanCallingIdentity(() ->
		callback.onError(new SatelliteException(resultCode))));
		executor.execute(() -> Binder.withCleanCallingIdentity(
		() -> callback.onError(new SatelliteException(resultCode))));
		}
		}
		};

telephony/java/android/telephony/satellite/SatelliteSessionStats.java

+219 −9

Original line number	Diff line number	Diff line
		@@ -19,22 +19,37 @@ package android.telephony.satellite;
		import android.annotation.NonNull;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.Log;

		import java.util.HashMap;
		import java.util.Map;
		import java.util.Objects;

		/**
		* SatelliteSessionStats is used to represent the usage stats of the satellite service.
		*
		* @hide
		*/
		public class SatelliteSessionStats implements Parcelable {

		private int mCountOfSuccessfulUserMessages;
		private int mCountOfUnsuccessfulUserMessages;
		private int mCountOfTimedOutUserMessagesWaitingForConnection;
		private int mCountOfTimedOutUserMessagesWaitingForAck;
		private int mCountOfUserMessagesInQueueToBeSent;
		private long mLatencyOfSuccessfulUserMessages;

		private Map<Integer, SatelliteSessionStats> datagramStats;
		private long mMaxLatency;
		private long mLastMessageLatency;

		public SatelliteSessionStats() {
		this.datagramStats = new HashMap<>();
		}

		/**
		* SatelliteSessionStats constructor
		*
		* @param builder Builder to create SatelliteSessionStats object/
		*/
		public SatelliteSessionStats(@NonNull Builder builder) {
		@@ -45,6 +60,7 @@ public class SatelliteSessionStats implements Parcelable {
		mCountOfTimedOutUserMessagesWaitingForAck =
		builder.mCountOfTimedOutUserMessagesWaitingForAck;
		mCountOfUserMessagesInQueueToBeSent = builder.mCountOfUserMessagesInQueueToBeSent;
		mLatencyOfSuccessfulUserMessages = builder.mLatencyOfSuccessfulUserMessages;
		}

		private SatelliteSessionStats(Parcel in) {
		@@ -63,6 +79,19 @@ public class SatelliteSessionStats implements Parcelable {
		out.writeInt(mCountOfTimedOutUserMessagesWaitingForConnection);
		out.writeInt(mCountOfTimedOutUserMessagesWaitingForAck);
		out.writeInt(mCountOfUserMessagesInQueueToBeSent);
		out.writeLong(mLatencyOfSuccessfulUserMessages);
		out.writeLong(mMaxLatency);
		out.writeLong(mLastMessageLatency);

		if (datagramStats != null && !datagramStats.isEmpty()) {
		out.writeInt(datagramStats.size());
		for (Map.Entry<Integer, SatelliteSessionStats> entry : datagramStats.entrySet()) {
		out.writeInt(entry.getKey());
		out.writeParcelable(entry.getValue(), flags);
		}
		} else {
		out.writeInt(0);
		}
		}

		@NonNull
		@@ -83,6 +112,40 @@ public class SatelliteSessionStats implements Parcelable {
		@NonNull
		public String toString() {
		StringBuilder sb = new StringBuilder();
		if (datagramStats != null) {
		sb.append(" ====== SatelliteSessionStatsWrapper Info =============");
		for (Map.Entry<Integer, SatelliteSessionStats> entry : datagramStats.entrySet()) {
		Integer key = entry.getKey();
		SatelliteSessionStats value = entry.getValue();
		sb.append("\n");
		sb.append("Key:");
		sb.append(key);
		sb.append(", SatelliteSessionStats:[");
		value.getPrintableCounters(sb);
		sb.append(",");
		sb.append(" LatencyOfSuccessfulUserMessages:");
		sb.append(value.mLatencyOfSuccessfulUserMessages);
		sb.append(",");
		sb.append(" mMaxLatency:");
		sb.append(value.mMaxLatency);
		sb.append(",");
		sb.append(" mLastMessageLatency:");
		sb.append(value.mLastMessageLatency);
		sb.append("]");
		sb.append("\n");
		}
		sb.append(" ============== ================== ===============");
		sb.append("\n");
		sb.append("\n");
		} else {
		sb.append("\n");
		getPrintableCounters(sb);
		}
		sb.append("\n");
		return sb.toString();
		}

		private void getPrintableCounters(StringBuilder sb) {
		sb.append("countOfSuccessfulUserMessages:");
		sb.append(mCountOfSuccessfulUserMessages);
		sb.append(",");
		@@ -101,7 +164,6 @@ public class SatelliteSessionStats implements Parcelable {

		sb.append("countOfUserMessagesInQueueToBeSent:");
		sb.append(mCountOfUserMessagesInQueueToBeSent);
		return sb.toString();
		}

		@Override
		@@ -110,49 +172,176 @@ public class SatelliteSessionStats implements Parcelable {
		if (o == null \|\| getClass() != o.getClass()) return false;
		SatelliteSessionStats that = (SatelliteSessionStats) o;
		return mCountOfSuccessfulUserMessages == that.mCountOfSuccessfulUserMessages
		&& mLatencyOfSuccessfulUserMessages == that.mLatencyOfSuccessfulUserMessages
		&& mCountOfUnsuccessfulUserMessages == that.mCountOfUnsuccessfulUserMessages
		&& mCountOfTimedOutUserMessagesWaitingForConnection
		== that.mCountOfTimedOutUserMessagesWaitingForConnection
		&& mCountOfTimedOutUserMessagesWaitingForAck
		== that.mCountOfTimedOutUserMessagesWaitingForAck
		&& mCountOfUserMessagesInQueueToBeSent
		== that.mCountOfUserMessagesInQueueToBeSent;
		&& mCountOfUserMessagesInQueueToBeSent == that.mCountOfUserMessagesInQueueToBeSent;
		}

		@Override
		public int hashCode() {
		return Objects.hash(mCountOfSuccessfulUserMessages, mCountOfUnsuccessfulUserMessages,
		mCountOfTimedOutUserMessagesWaitingForConnection,
		mCountOfTimedOutUserMessagesWaitingForAck,
		mCountOfUserMessagesInQueueToBeSent);
		return Objects.hash(mCountOfSuccessfulUserMessages, mLatencyOfSuccessfulUserMessages,
		mCountOfUnsuccessfulUserMessages, mCountOfTimedOutUserMessagesWaitingForConnection,
		mCountOfTimedOutUserMessagesWaitingForAck, mCountOfUserMessagesInQueueToBeSent);
		}

		public int getCountOfSuccessfulUserMessages() {
		return mCountOfSuccessfulUserMessages;
		}

		public void incrementSuccessfulUserMessageCount() {
		mCountOfSuccessfulUserMessages++;
		}

		public int getCountOfUnsuccessfulUserMessages() {
		return mCountOfUnsuccessfulUserMessages;
		}

		public void incrementUnsuccessfulUserMessageCount() {
		mCountOfUnsuccessfulUserMessages++;
		}

		public int getCountOfTimedOutUserMessagesWaitingForConnection() {
		return mCountOfTimedOutUserMessagesWaitingForConnection;
		}

		public void incrementTimedOutUserMessagesWaitingForConnection() {
		mCountOfTimedOutUserMessagesWaitingForConnection++;
		}

		public int getCountOfTimedOutUserMessagesWaitingForAck() {
		return mCountOfTimedOutUserMessagesWaitingForAck;
		}

		public void incrementTimedOutUserMessagesWaitingForAck() {
		mCountOfTimedOutUserMessagesWaitingForAck++;
		}

		public int getCountOfUserMessagesInQueueToBeSent() {
		return mCountOfUserMessagesInQueueToBeSent;
		}

		public long getLatencyOfAllSuccessfulUserMessages() {
		return mLatencyOfSuccessfulUserMessages;
		}

		public void updateLatencyOfAllSuccessfulUserMessages(long messageLatency) {
		mLatencyOfSuccessfulUserMessages += messageLatency;
		}

		public void recordSuccessfulOutgoingDatagramStats(
		@SatelliteManager.DatagramType int datagramType, long latency) {
		try {
		datagramStats.putIfAbsent(datagramType, new SatelliteSessionStats.Builder().build());
		SatelliteSessionStats data = datagramStats.get(datagramType);
		data.incrementSuccessfulUserMessageCount();
		if (data.mMaxLatency < latency) {
		data.mMaxLatency = latency;
		}
		data.mLastMessageLatency = latency;
		data.updateLatencyOfAllSuccessfulUserMessages(latency);
		} catch (Exception e) {
		Log.e("SatelliteSessionStats",
		"Error while recordSuccessfulOutgoingDatagramStats: " + e.getMessage());
		}
		}

		public int getCountOfSuccessfulOutgoingDatagram(
		@SatelliteManager.DatagramType int datagramType) {
		SatelliteSessionStats data = datagramStats.getOrDefault(datagramType,
		new SatelliteSessionStats());
		return data.getCountOfSuccessfulUserMessages();
		}

		public long getMaxLatency() {
		return this.mMaxLatency;
		}

		public Long getLatencyOfAllSuccessfulUserMessages(
		@SatelliteManager.DatagramType int datagramType) {
		SatelliteSessionStats data = datagramStats.getOrDefault(datagramType,
		new SatelliteSessionStats());
		return data.getLatencyOfAllSuccessfulUserMessages();
		}


		public long getLastMessageLatency() {
		return this.mLastMessageLatency;
		}

		public void addCountOfUnsuccessfulUserMessages(@SatelliteManager.DatagramType int datagramType,
		@SatelliteManager.SatelliteResult int resultCode) {
		try {
		datagramStats.putIfAbsent(datagramType, new SatelliteSessionStats.Builder().build());
		SatelliteSessionStats data = datagramStats.get(datagramType);
		data.incrementUnsuccessfulUserMessageCount();
		if (resultCode == SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE) {
		data.incrementTimedOutUserMessagesWaitingForConnection();
		} else if (resultCode == SatelliteManager.SATELLITE_RESULT_MODEM_TIMEOUT) {
		data.incrementTimedOutUserMessagesWaitingForAck();
		}
		} catch (Exception e) {
		Log.e("SatelliteSessionStats",
		"Error while addCountOfUnsuccessfulUserMessages: " + e.getMessage());
		}
		}

		public int getCountOfUnsuccessfulUserMessages(@SatelliteManager.DatagramType int datagramType) {
		SatelliteSessionStats data = datagramStats.get(datagramType);
		return data.getCountOfUnsuccessfulUserMessages();
		}

		public int getCountOfTimedOutUserMessagesWaitingForConnection(
		@SatelliteManager.DatagramType int datagramType) {
		SatelliteSessionStats data = datagramStats.get(datagramType);
		return data.getCountOfTimedOutUserMessagesWaitingForConnection();
		}

		public int getCountOfTimedOutUserMessagesWaitingForAck(
		@SatelliteManager.DatagramType int datagramType) {
		SatelliteSessionStats data = datagramStats.get(datagramType);
		return data.getCountOfTimedOutUserMessagesWaitingForAck();
		}

		public int getCountOfUserMessagesInQueueToBeSent(
		@SatelliteManager.DatagramType int datagramType) {
		SatelliteSessionStats data = datagramStats.get(datagramType);
		return data.getCountOfUserMessagesInQueueToBeSent();
		}

		public void clear() {
		datagramStats.clear();
		}

		public Map<Integer, SatelliteSessionStats> getSatelliteSessionStats() {
		return datagramStats;
		}

		public void setSatelliteSessionStats(Map<Integer, SatelliteSessionStats> sessionStats) {
		this.datagramStats = sessionStats;
		}

		private void readFromParcel(Parcel in) {
		mCountOfSuccessfulUserMessages = in.readInt();
		mCountOfUnsuccessfulUserMessages = in.readInt();
		mCountOfTimedOutUserMessagesWaitingForConnection = in.readInt();
		mCountOfTimedOutUserMessagesWaitingForAck = in.readInt();
		mCountOfUserMessagesInQueueToBeSent = in.readInt();
		mLatencyOfSuccessfulUserMessages = in.readLong();
		mMaxLatency = in.readLong();
		mLastMessageLatency = in.readLong();

		int size = in.readInt();
		datagramStats = new HashMap<>();
		for (int i = 0; i < size; i++) {
		Integer key = in.readInt();
		SatelliteSessionStats value = in.readParcelable(
		SatelliteSessionStats.class.getClassLoader());
		datagramStats.put(key, value);
		}
		}

		/**
		@@ -164,7 +353,10 @@ public class SatelliteSessionStats implements Parcelable {
		private int mCountOfTimedOutUserMessagesWaitingForConnection;
		private int mCountOfTimedOutUserMessagesWaitingForAck;
		private int mCountOfUserMessagesInQueueToBeSent;
		private long mLatencyOfSuccessfulUserMessages;

		private long mMaxLatency;
		private long mLastMessageLatency;
		/**
		* Sets countOfSuccessfulUserMessages value of {@link SatelliteSessionStats}
		* and then returns the Builder class.
		@@ -215,6 +407,24 @@ public class SatelliteSessionStats implements Parcelable {
		return this;
		}

		@NonNull
		public Builder setLatencyOfSuccessfulUserMessages(long latency) {
		mLatencyOfSuccessfulUserMessages = latency;
		return this;
		}

		@NonNull
		public Builder setMaxLatency(long maxLatency) {
		mMaxLatency = maxLatency;
		return this;
		}

		@NonNull
		public Builder setLastLatency(long lastLatency) {
		mLastMessageLatency = lastLatency;
		return this;
		}

		/** Returns SatelliteSessionStats object. */
		@NonNull
		public SatelliteSessionStats build() {