Loading proto/src/persist_atoms.proto +11 −0 Original line number Diff line number Diff line Loading @@ -659,6 +659,14 @@ message SatelliteController { optional int32 total_service_uptime_sec = 15; optional int32 total_battery_consumption_percent = 16; optional int32 total_battery_charged_time_sec = 17; optional int32 count_of_demo_mode_satellite_service_enablements_success = 18; optional int32 count_of_demo_mode_satellite_service_enablements_fail = 19; optional int32 count_of_demo_mode_outgoing_datagram_success = 20; optional int32 count_of_demo_mode_outgoing_datagram_fail = 21; optional int32 count_of_demo_mode_incoming_datagram_success = 22; optional int32 count_of_demo_mode_incoming_datagram_fail = 23; optional int32 count_of_datagram_type_keep_alive_success = 24; optional int32 count_of_datagram_type_keep_alive_fail = 25; } message SatelliteSession { Loading @@ -673,12 +681,14 @@ message SatelliteSession { optional int32 count_of_outgoing_datagram_failed = 9; optional int32 count_of_incoming_datagram_success = 10; optional int32 count_of_incoming_datagram_failed = 11; optional bool is_demo_mode = 12; } message SatelliteIncomingDatagram { optional int32 result_code = 1; optional int32 datagram_size_bytes = 2; optional int64 datagram_transfer_time_millis = 3; optional bool is_demo_mode = 4; } message SatelliteOutgoingDatagram { Loading @@ -686,6 +696,7 @@ message SatelliteOutgoingDatagram { optional int32 result_code = 2; optional int32 datagram_size_bytes = 3; optional int64 datagram_transfer_time_millis = 4; optional bool is_demo_mode = 5; } message SatelliteProvision { Loading src/java/com/android/internal/telephony/metrics/MetricsCollector.java +15 −4 Original line number Diff line number Diff line Loading @@ -1345,7 +1345,15 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { satelliteController.countOfDeprovisionFail, satelliteController.totalServiceUptimeSec, satelliteController.totalBatteryConsumptionPercent, satelliteController.totalBatteryChargedTimeSec); satelliteController.totalBatteryChargedTimeSec, satelliteController.countOfDemoModeSatelliteServiceEnablementsSuccess, satelliteController.countOfDemoModeSatelliteServiceEnablementsFail, satelliteController.countOfDemoModeOutgoingDatagramSuccess, satelliteController.countOfDemoModeOutgoingDatagramFail, satelliteController.countOfDemoModeIncomingDatagramSuccess, satelliteController.countOfDemoModeIncomingDatagramFail, satelliteController.countOfDatagramTypeKeepAliveSuccess, satelliteController.countOfDatagramTypeKeepAliveFail); } private static StatsEvent buildStatsEvent(SatelliteSession satelliteSession) { Loading @@ -1361,7 +1369,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { satelliteSession.countOfOutgoingDatagramSuccess, satelliteSession.countOfOutgoingDatagramFailed, satelliteSession.countOfIncomingDatagramSuccess, satelliteSession.countOfIncomingDatagramFailed); satelliteSession.countOfIncomingDatagramFailed, satelliteSession.isDemoMode); } private static StatsEvent buildStatsEvent(SatelliteIncomingDatagram stats) { Loading @@ -1369,7 +1378,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { SATELLITE_INCOMING_DATAGRAM, stats.resultCode, stats.datagramSizeBytes, stats.datagramTransferTimeMillis); stats.datagramTransferTimeMillis, stats.isDemoMode); } private static StatsEvent buildStatsEvent(SatelliteOutgoingDatagram stats) { Loading @@ -1378,7 +1388,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { stats.datagramType, stats.resultCode, stats.datagramSizeBytes, stats.datagramTransferTimeMillis); stats.datagramTransferTimeMillis, stats.isDemoMode); } private static StatsEvent buildStatsEvent(SatelliteProvision stats) { Loading src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java +18 −1 Original line number Diff line number Diff line Loading @@ -739,6 +739,22 @@ public class PersistAtomsStorage { += stats.totalBatteryConsumptionPercent; atom.totalBatteryChargedTimeSec += stats.totalBatteryChargedTimeSec; atom.countOfDemoModeSatelliteServiceEnablementsSuccess += stats.countOfDemoModeSatelliteServiceEnablementsSuccess; atom.countOfDemoModeSatelliteServiceEnablementsFail += stats.countOfDemoModeSatelliteServiceEnablementsFail; atom.countOfDemoModeOutgoingDatagramSuccess += stats.countOfDemoModeOutgoingDatagramSuccess; atom.countOfDemoModeOutgoingDatagramFail += stats.countOfDemoModeOutgoingDatagramFail; atom.countOfDemoModeIncomingDatagramSuccess += stats.countOfDemoModeIncomingDatagramSuccess; atom.countOfDemoModeIncomingDatagramFail += stats.countOfDemoModeIncomingDatagramFail; atom.countOfDatagramTypeKeepAliveSuccess += stats.countOfDatagramTypeKeepAliveSuccess; atom.countOfDatagramTypeKeepAliveFail += stats.countOfDatagramTypeKeepAliveFail; mAtoms.satelliteController = atomArray; saveAtomsToFile(SAVE_TO_FILE_DELAY_FOR_UPDATE_MILLIS); Loading Loading @@ -2068,7 +2084,8 @@ public class PersistAtomsStorage { && stats.countOfOutgoingDatagramSuccess == key.countOfOutgoingDatagramSuccess && stats.countOfOutgoingDatagramFailed == key.countOfOutgoingDatagramFailed && stats.countOfIncomingDatagramSuccess == key.countOfIncomingDatagramSuccess && stats.countOfIncomingDatagramFailed == key.countOfIncomingDatagramFailed) { && stats.countOfIncomingDatagramFailed == key.countOfIncomingDatagramFailed && stats.isDemoMode == key.isDemoMode) { return stats; } } Loading src/java/com/android/internal/telephony/metrics/SatelliteStats.java +231 −3 Original line number Diff line number Diff line Loading @@ -69,6 +69,14 @@ public class SatelliteStats { private final int mTotalServiceUptimeSec; private final int mTotalBatteryConsumptionPercent; private final int mTotalBatteryChargedTimeSec; private final int mCountOfDemoModeSatelliteServiceEnablementsSuccess; private final int mCountOfDemoModeSatelliteServiceEnablementsFail; private final int mCountOfDemoModeOutgoingDatagramSuccess; private final int mCountOfDemoModeOutgoingDatagramFail; private final int mCountOfDemoModeIncomingDatagramSuccess; private final int mCountOfDemoModeIncomingDatagramFail; private final int mCountOfDatagramTypeKeepAliveSuccess; private final int mCountOfDatagramTypeKeepAliveFail; private SatelliteControllerParams(Builder builder) { this.mCountOfSatelliteServiceEnablementsSuccess = Loading @@ -92,6 +100,22 @@ public class SatelliteStats { this.mTotalServiceUptimeSec = builder.mTotalServiceUptimeSec; this.mTotalBatteryConsumptionPercent = builder.mTotalBatteryConsumptionPercent; this.mTotalBatteryChargedTimeSec = builder.mTotalBatteryChargedTimeSec; this.mCountOfDemoModeSatelliteServiceEnablementsSuccess = builder.mCountOfDemoModeSatelliteServiceEnablementsSuccess; this.mCountOfDemoModeSatelliteServiceEnablementsFail = builder.mCountOfDemoModeSatelliteServiceEnablementsFail; this.mCountOfDemoModeOutgoingDatagramSuccess = builder.mCountOfDemoModeOutgoingDatagramSuccess; this.mCountOfDemoModeOutgoingDatagramFail = builder.mCountOfDemoModeOutgoingDatagramFail; this.mCountOfDemoModeIncomingDatagramSuccess = builder.mCountOfDemoModeIncomingDatagramSuccess; this.mCountOfDemoModeIncomingDatagramFail = builder.mCountOfDemoModeIncomingDatagramFail; this.mCountOfDatagramTypeKeepAliveSuccess = builder.mCountOfDatagramTypeKeepAliveSuccess; this.mCountOfDatagramTypeKeepAliveFail = builder.mCountOfDatagramTypeKeepAliveFail; } public int getCountOfSatelliteServiceEnablementsSuccess() { Loading Loading @@ -162,6 +186,38 @@ public class SatelliteStats { return mTotalBatteryChargedTimeSec; } public int getCountOfDemoModeSatelliteServiceEnablementsSuccess() { return mCountOfDemoModeSatelliteServiceEnablementsSuccess; } public int getCountOfDemoModeSatelliteServiceEnablementsFail() { return mCountOfDemoModeSatelliteServiceEnablementsFail; } public int getCountOfDemoModeOutgoingDatagramSuccess() { return mCountOfDemoModeOutgoingDatagramSuccess; } public int getCountOfDemoModeOutgoingDatagramFail() { return mCountOfDemoModeOutgoingDatagramFail; } public int getCountOfDemoModeIncomingDatagramSuccess() { return mCountOfDemoModeIncomingDatagramSuccess; } public int getCountOfDemoModeIncomingDatagramFail() { return mCountOfDemoModeIncomingDatagramFail; } public int getCountOfDatagramTypeKeepAliveSuccess() { return mCountOfDatagramTypeKeepAliveSuccess; } public int getCountOfDatagramTypeKeepAliveFail() { return mCountOfDatagramTypeKeepAliveFail; } /** * A builder class to create {@link SatelliteControllerParams} data structure class */ Loading @@ -183,6 +239,14 @@ public class SatelliteStats { private int mTotalServiceUptimeSec = 0; private int mTotalBatteryConsumptionPercent = 0; private int mTotalBatteryChargedTimeSec = 0; private int mCountOfDemoModeSatelliteServiceEnablementsSuccess = 0; private int mCountOfDemoModeSatelliteServiceEnablementsFail = 0; private int mCountOfDemoModeOutgoingDatagramSuccess = 0; private int mCountOfDemoModeOutgoingDatagramFail = 0; private int mCountOfDemoModeIncomingDatagramSuccess = 0; private int mCountOfDemoModeIncomingDatagramFail = 0; private int mCountOfDatagramTypeKeepAliveSuccess = 0; private int mCountOfDatagramTypeKeepAliveFail = 0; /** * Sets countOfSatelliteServiceEnablementsSuccess value of {@link SatelliteController} Loading Loading @@ -346,6 +410,90 @@ public class SatelliteStats { return this; } /** * Sets countOfDemoModeSatelliteServiceEnablementsSuccess value of * {@link SatelliteController} atom then returns Builder class */ public Builder setCountOfDemoModeSatelliteServiceEnablementsSuccess( int countOfDemoModeSatelliteServiceEnablementsSuccess) { this.mCountOfDemoModeSatelliteServiceEnablementsSuccess = countOfDemoModeSatelliteServiceEnablementsSuccess; return this; } /** * Sets countOfDemoModeSatelliteServiceEnablementsFail value of * {@link SatelliteController} atom then returns Builder class */ public Builder setCountOfDemoModeSatelliteServiceEnablementsFail( int countOfDemoModeSatelliteServiceEnablementsFail) { this.mCountOfDemoModeSatelliteServiceEnablementsFail = countOfDemoModeSatelliteServiceEnablementsFail; return this; } /** * Sets countOfDemoModeOutgoingDatagramSuccess value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDemoModeOutgoingDatagramSuccess( int countOfDemoModeOutgoingDatagramSuccess) { this.mCountOfDemoModeOutgoingDatagramSuccess = countOfDemoModeOutgoingDatagramSuccess; return this; } /** * Sets countOfDemoModeOutgoingDatagramFail value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDemoModeOutgoingDatagramFail( int countOfDemoModeOutgoingDatagramFail) { this.mCountOfDemoModeOutgoingDatagramFail = countOfDemoModeOutgoingDatagramFail; return this; } /** * Sets countOfDemoModeIncomingDatagramSuccess value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDemoModeIncomingDatagramSuccess( int countOfDemoModeIncomingDatagramSuccess) { this.mCountOfDemoModeIncomingDatagramSuccess = countOfDemoModeIncomingDatagramSuccess; return this; } /** * Sets countOfDemoModeIncomingDatagramFail value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDemoModeIncomingDatagramFail( int countOfDemoModeIncomingDatagramFail) { this.mCountOfDemoModeIncomingDatagramFail = countOfDemoModeIncomingDatagramFail; return this; } /** * Sets countOfDatagramTypeKeepAliveSuccess value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDatagramTypeKeepAliveSuccess( int countOfDatagramTypeKeepAliveSuccess) { this.mCountOfDatagramTypeKeepAliveSuccess = countOfDatagramTypeKeepAliveSuccess; return this; } /** * Sets countOfDatagramTypeKeepAliveFail value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDatagramTypeKeepAliveFail( int countOfDatagramTypeKeepAliveFail) { this.mCountOfDatagramTypeKeepAliveFail = countOfDatagramTypeKeepAliveFail; return this; } /** * Returns ControllerParams, which contains whole component of * {@link SatelliteController} atom Loading Loading @@ -376,6 +524,22 @@ public class SatelliteStats { + ", serviceUptimeSec=" + mTotalServiceUptimeSec + ", batteryConsumptionPercent=" + mTotalBatteryConsumptionPercent + ", batteryChargedTimeSec=" + mTotalBatteryChargedTimeSec + ", countOfDemoModeSatelliteServiceEnablementsSuccess=" + mCountOfDemoModeSatelliteServiceEnablementsSuccess + ", countOfDemoModeSatelliteServiceEnablementsFail=" + mCountOfDemoModeSatelliteServiceEnablementsFail + ", countOfDemoModeOutgoingDatagramSuccess=" + mCountOfDemoModeOutgoingDatagramSuccess + ", countOfDemoModeOutgoingDatagramFail=" + mCountOfDemoModeOutgoingDatagramFail + ", countOfDemoModeIncomingDatagramSuccess=" + mCountOfDemoModeIncomingDatagramSuccess + ", countOfDemoModeIncomingDatagramFail=" + mCountOfDemoModeIncomingDatagramFail + ", countOfDatagramTypeKeepAliveSuccess=" + mCountOfDatagramTypeKeepAliveSuccess + ", countOfDatagramTypeKeepAliveFail=" + mCountOfDatagramTypeKeepAliveFail + ")"; } } Loading @@ -395,6 +559,7 @@ public class SatelliteStats { private final int mCountOfOutgoingDatagramFailed; private final int mCountOfIncomingDatagramSuccess; private final int mCountOfIncomingDatagramFailed; private final boolean mIsDemoMode; private SatelliteSessionParams(Builder builder) { this.mSatelliteServiceInitializationResult = Loading @@ -409,6 +574,7 @@ public class SatelliteStats { this.mCountOfOutgoingDatagramFailed = builder.mCountOfOutgoingDatagramFailed; this.mCountOfIncomingDatagramSuccess = builder.mCountOfIncomingDatagramSuccess; this.mCountOfIncomingDatagramFailed = builder.mCountOfIncomingDatagramFailed; this.mIsDemoMode = builder.mIsDemoMode; } public int getSatelliteServiceInitializationResult() { Loading Loading @@ -451,6 +617,10 @@ public class SatelliteStats { return mCountOfIncomingDatagramFailed; } public boolean getIsDemoMode() { return mIsDemoMode; } /** * A builder class to create {@link SatelliteSessionParams} data structure class */ Loading @@ -465,6 +635,7 @@ public class SatelliteStats { private int mCountOfOutgoingDatagramFailed = -1; private int mCountOfIncomingDatagramSuccess = -1; private int mCountOfIncomingDatagramFailed = -1; private boolean mIsDemoMode = false; /** * Sets satelliteServiceInitializationResult value of {@link SatelliteSession} Loading Loading @@ -534,6 +705,12 @@ public class SatelliteStats { return this; } /** Sets whether enabled satellite session is for demo mode or not. */ public Builder setIsDemoMode(boolean isDemoMode) { this.mIsDemoMode = isDemoMode; return this; } /** * Returns SessionParams, which contains whole component of * {@link SatelliteSession} atom Loading @@ -557,6 +734,7 @@ public class SatelliteStats { + ", CountOfOutgoingDatagramFailed=" + mCountOfOutgoingDatagramFailed + ", CountOfIncomingDatagramSuccess=" + mCountOfIncomingDatagramSuccess + ", CountOfIncomingDatagramFailed=" + mCountOfIncomingDatagramFailed + ", IsDemoMode=" + mIsDemoMode + ")"; } } Loading @@ -569,11 +747,13 @@ public class SatelliteStats { private final int mResultCode; private final int mDatagramSizeBytes; private final long mDatagramTransferTimeMillis; private final boolean mIsDemoMode; private SatelliteIncomingDatagramParams(Builder builder) { this.mResultCode = builder.mResultCode; this.mDatagramSizeBytes = builder.mDatagramSizeBytes; this.mDatagramTransferTimeMillis = builder.mDatagramTransferTimeMillis; this.mIsDemoMode = builder.mIsDemoMode; } public int getResultCode() { Loading @@ -588,6 +768,10 @@ public class SatelliteStats { return mDatagramTransferTimeMillis; } public boolean getIsDemoMode() { return mIsDemoMode; } /** * A builder class to create {@link SatelliteIncomingDatagramParams} data structure class */ Loading @@ -595,6 +779,7 @@ public class SatelliteStats { private int mResultCode = -1; private int mDatagramSizeBytes = -1; private long mDatagramTransferTimeMillis = -1; private boolean mIsDemoMode = false; /** * Sets resultCode value of {@link SatelliteIncomingDatagram} atom Loading Loading @@ -623,6 +808,15 @@ public class SatelliteStats { return this; } /** * Sets whether transferred datagram is in demo mode or not * then returns Builder class */ public Builder setIsDemoMode(boolean isDemoMode) { this.mIsDemoMode = isDemoMode; return this; } /** * Returns IncomingDatagramParams, which contains whole component of * {@link SatelliteIncomingDatagram} atom Loading @@ -638,7 +832,9 @@ public class SatelliteStats { return "IncomingDatagramParams(" + ", resultCode=" + mResultCode + ", datagramSizeBytes=" + mDatagramSizeBytes + ", datagramTransferTimeMillis=" + mDatagramTransferTimeMillis + ")"; + ", datagramTransferTimeMillis=" + mDatagramTransferTimeMillis + ", isDemoMode=" + mIsDemoMode + ")"; } } Loading @@ -651,12 +847,14 @@ public class SatelliteStats { private final int mResultCode; private final int mDatagramSizeBytes; private final long mDatagramTransferTimeMillis; private final boolean mIsDemoMode; private SatelliteOutgoingDatagramParams(Builder builder) { this.mDatagramType = builder.mDatagramType; this.mResultCode = builder.mResultCode; this.mDatagramSizeBytes = builder.mDatagramSizeBytes; this.mDatagramTransferTimeMillis = builder.mDatagramTransferTimeMillis; this.mIsDemoMode = builder.mIsDemoMode; } public int getDatagramType() { Loading @@ -675,6 +873,10 @@ public class SatelliteStats { return mDatagramTransferTimeMillis; } public boolean getIsDemoMode() { return mIsDemoMode; } /** * A builder class to create {@link SatelliteOutgoingDatagramParams} data structure class */ Loading @@ -683,6 +885,7 @@ public class SatelliteStats { private int mResultCode = -1; private int mDatagramSizeBytes = -1; private long mDatagramTransferTimeMillis = -1; private boolean mIsDemoMode = false; /** * Sets datagramType value of {@link SatelliteOutgoingDatagram} atom Loading Loading @@ -720,6 +923,15 @@ public class SatelliteStats { return this; } /** * Sets whether transferred datagram is in demo mode or not * then returns Builder class */ public Builder setIsDemoMode(boolean isDemoMode) { this.mIsDemoMode = isDemoMode; return this; } /** * Returns OutgoingDatagramParams, which contains whole component of * {@link SatelliteOutgoingDatagram} atom Loading @@ -736,7 +948,9 @@ public class SatelliteStats { + "datagramType=" + mDatagramType + ", resultCode=" + mResultCode + ", datagramSizeBytes=" + mDatagramSizeBytes + ", datagramTransferTimeMillis=" + mDatagramTransferTimeMillis + ")"; + ", datagramTransferTimeMillis=" + mDatagramTransferTimeMillis + ", isDemoMode=" + mIsDemoMode + ")"; } } Loading Loading @@ -1016,7 +1230,18 @@ public class SatelliteStats { proto.totalServiceUptimeSec = param.getTotalServiceUptimeSec(); proto.totalBatteryConsumptionPercent = param.getTotalBatteryConsumptionPercent(); proto.totalBatteryChargedTimeSec = param.getTotalBatteryChargedTimeSec(); proto.countOfDemoModeSatelliteServiceEnablementsSuccess = param.getCountOfDemoModeSatelliteServiceEnablementsSuccess(); proto.countOfDemoModeSatelliteServiceEnablementsFail = param.getCountOfDemoModeSatelliteServiceEnablementsFail(); proto.countOfDemoModeOutgoingDatagramSuccess = param.getCountOfDemoModeOutgoingDatagramSuccess(); proto.countOfDemoModeOutgoingDatagramFail = param.getCountOfDemoModeOutgoingDatagramFail(); proto.countOfDemoModeIncomingDatagramSuccess = param.getCountOfDemoModeIncomingDatagramSuccess(); proto.countOfDemoModeIncomingDatagramFail = param.getCountOfDemoModeIncomingDatagramFail(); proto.countOfDatagramTypeKeepAliveSuccess = param.getCountOfDatagramTypeKeepAliveSuccess(); proto.countOfDatagramTypeKeepAliveFail = param.getCountOfDatagramTypeKeepAliveFail(); mAtomsStorage.addSatelliteControllerStats(proto); } Loading @@ -1035,6 +1260,7 @@ public class SatelliteStats { proto.countOfOutgoingDatagramFailed = param.getCountOfOutgoingDatagramFailed(); proto.countOfIncomingDatagramSuccess = param.getCountOfIncomingDatagramSuccess(); proto.countOfIncomingDatagramFailed = param.getCountOfOutgoingDatagramFailed(); proto.isDemoMode = param.getIsDemoMode(); mAtomsStorage.addSatelliteSessionStats(proto); } Loading @@ -1045,6 +1271,7 @@ public class SatelliteStats { proto.resultCode = param.getResultCode(); proto.datagramSizeBytes = param.getDatagramSizeBytes(); proto.datagramTransferTimeMillis = param.getDatagramTransferTimeMillis(); proto.isDemoMode = param.getIsDemoMode(); mAtomsStorage.addSatelliteIncomingDatagramStats(proto); } Loading @@ -1056,6 +1283,7 @@ public class SatelliteStats { proto.resultCode = param.getResultCode(); proto.datagramSizeBytes = param.getDatagramSizeBytes(); proto.datagramTransferTimeMillis = param.getDatagramTransferTimeMillis(); proto.isDemoMode = param.getIsDemoMode(); mAtomsStorage.addSatelliteOutgoingDatagramStats(proto); } Loading src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java +9 −5 File changed.Preview size limit exceeded, changes collapsed. Show changes Loading
proto/src/persist_atoms.proto +11 −0 Original line number Diff line number Diff line Loading @@ -659,6 +659,14 @@ message SatelliteController { optional int32 total_service_uptime_sec = 15; optional int32 total_battery_consumption_percent = 16; optional int32 total_battery_charged_time_sec = 17; optional int32 count_of_demo_mode_satellite_service_enablements_success = 18; optional int32 count_of_demo_mode_satellite_service_enablements_fail = 19; optional int32 count_of_demo_mode_outgoing_datagram_success = 20; optional int32 count_of_demo_mode_outgoing_datagram_fail = 21; optional int32 count_of_demo_mode_incoming_datagram_success = 22; optional int32 count_of_demo_mode_incoming_datagram_fail = 23; optional int32 count_of_datagram_type_keep_alive_success = 24; optional int32 count_of_datagram_type_keep_alive_fail = 25; } message SatelliteSession { Loading @@ -673,12 +681,14 @@ message SatelliteSession { optional int32 count_of_outgoing_datagram_failed = 9; optional int32 count_of_incoming_datagram_success = 10; optional int32 count_of_incoming_datagram_failed = 11; optional bool is_demo_mode = 12; } message SatelliteIncomingDatagram { optional int32 result_code = 1; optional int32 datagram_size_bytes = 2; optional int64 datagram_transfer_time_millis = 3; optional bool is_demo_mode = 4; } message SatelliteOutgoingDatagram { Loading @@ -686,6 +696,7 @@ message SatelliteOutgoingDatagram { optional int32 result_code = 2; optional int32 datagram_size_bytes = 3; optional int64 datagram_transfer_time_millis = 4; optional bool is_demo_mode = 5; } message SatelliteProvision { Loading
src/java/com/android/internal/telephony/metrics/MetricsCollector.java +15 −4 Original line number Diff line number Diff line Loading @@ -1345,7 +1345,15 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { satelliteController.countOfDeprovisionFail, satelliteController.totalServiceUptimeSec, satelliteController.totalBatteryConsumptionPercent, satelliteController.totalBatteryChargedTimeSec); satelliteController.totalBatteryChargedTimeSec, satelliteController.countOfDemoModeSatelliteServiceEnablementsSuccess, satelliteController.countOfDemoModeSatelliteServiceEnablementsFail, satelliteController.countOfDemoModeOutgoingDatagramSuccess, satelliteController.countOfDemoModeOutgoingDatagramFail, satelliteController.countOfDemoModeIncomingDatagramSuccess, satelliteController.countOfDemoModeIncomingDatagramFail, satelliteController.countOfDatagramTypeKeepAliveSuccess, satelliteController.countOfDatagramTypeKeepAliveFail); } private static StatsEvent buildStatsEvent(SatelliteSession satelliteSession) { Loading @@ -1361,7 +1369,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { satelliteSession.countOfOutgoingDatagramSuccess, satelliteSession.countOfOutgoingDatagramFailed, satelliteSession.countOfIncomingDatagramSuccess, satelliteSession.countOfIncomingDatagramFailed); satelliteSession.countOfIncomingDatagramFailed, satelliteSession.isDemoMode); } private static StatsEvent buildStatsEvent(SatelliteIncomingDatagram stats) { Loading @@ -1369,7 +1378,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { SATELLITE_INCOMING_DATAGRAM, stats.resultCode, stats.datagramSizeBytes, stats.datagramTransferTimeMillis); stats.datagramTransferTimeMillis, stats.isDemoMode); } private static StatsEvent buildStatsEvent(SatelliteOutgoingDatagram stats) { Loading @@ -1378,7 +1388,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { stats.datagramType, stats.resultCode, stats.datagramSizeBytes, stats.datagramTransferTimeMillis); stats.datagramTransferTimeMillis, stats.isDemoMode); } private static StatsEvent buildStatsEvent(SatelliteProvision stats) { Loading
src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java +18 −1 Original line number Diff line number Diff line Loading @@ -739,6 +739,22 @@ public class PersistAtomsStorage { += stats.totalBatteryConsumptionPercent; atom.totalBatteryChargedTimeSec += stats.totalBatteryChargedTimeSec; atom.countOfDemoModeSatelliteServiceEnablementsSuccess += stats.countOfDemoModeSatelliteServiceEnablementsSuccess; atom.countOfDemoModeSatelliteServiceEnablementsFail += stats.countOfDemoModeSatelliteServiceEnablementsFail; atom.countOfDemoModeOutgoingDatagramSuccess += stats.countOfDemoModeOutgoingDatagramSuccess; atom.countOfDemoModeOutgoingDatagramFail += stats.countOfDemoModeOutgoingDatagramFail; atom.countOfDemoModeIncomingDatagramSuccess += stats.countOfDemoModeIncomingDatagramSuccess; atom.countOfDemoModeIncomingDatagramFail += stats.countOfDemoModeIncomingDatagramFail; atom.countOfDatagramTypeKeepAliveSuccess += stats.countOfDatagramTypeKeepAliveSuccess; atom.countOfDatagramTypeKeepAliveFail += stats.countOfDatagramTypeKeepAliveFail; mAtoms.satelliteController = atomArray; saveAtomsToFile(SAVE_TO_FILE_DELAY_FOR_UPDATE_MILLIS); Loading Loading @@ -2068,7 +2084,8 @@ public class PersistAtomsStorage { && stats.countOfOutgoingDatagramSuccess == key.countOfOutgoingDatagramSuccess && stats.countOfOutgoingDatagramFailed == key.countOfOutgoingDatagramFailed && stats.countOfIncomingDatagramSuccess == key.countOfIncomingDatagramSuccess && stats.countOfIncomingDatagramFailed == key.countOfIncomingDatagramFailed) { && stats.countOfIncomingDatagramFailed == key.countOfIncomingDatagramFailed && stats.isDemoMode == key.isDemoMode) { return stats; } } Loading
src/java/com/android/internal/telephony/metrics/SatelliteStats.java +231 −3 Original line number Diff line number Diff line Loading @@ -69,6 +69,14 @@ public class SatelliteStats { private final int mTotalServiceUptimeSec; private final int mTotalBatteryConsumptionPercent; private final int mTotalBatteryChargedTimeSec; private final int mCountOfDemoModeSatelliteServiceEnablementsSuccess; private final int mCountOfDemoModeSatelliteServiceEnablementsFail; private final int mCountOfDemoModeOutgoingDatagramSuccess; private final int mCountOfDemoModeOutgoingDatagramFail; private final int mCountOfDemoModeIncomingDatagramSuccess; private final int mCountOfDemoModeIncomingDatagramFail; private final int mCountOfDatagramTypeKeepAliveSuccess; private final int mCountOfDatagramTypeKeepAliveFail; private SatelliteControllerParams(Builder builder) { this.mCountOfSatelliteServiceEnablementsSuccess = Loading @@ -92,6 +100,22 @@ public class SatelliteStats { this.mTotalServiceUptimeSec = builder.mTotalServiceUptimeSec; this.mTotalBatteryConsumptionPercent = builder.mTotalBatteryConsumptionPercent; this.mTotalBatteryChargedTimeSec = builder.mTotalBatteryChargedTimeSec; this.mCountOfDemoModeSatelliteServiceEnablementsSuccess = builder.mCountOfDemoModeSatelliteServiceEnablementsSuccess; this.mCountOfDemoModeSatelliteServiceEnablementsFail = builder.mCountOfDemoModeSatelliteServiceEnablementsFail; this.mCountOfDemoModeOutgoingDatagramSuccess = builder.mCountOfDemoModeOutgoingDatagramSuccess; this.mCountOfDemoModeOutgoingDatagramFail = builder.mCountOfDemoModeOutgoingDatagramFail; this.mCountOfDemoModeIncomingDatagramSuccess = builder.mCountOfDemoModeIncomingDatagramSuccess; this.mCountOfDemoModeIncomingDatagramFail = builder.mCountOfDemoModeIncomingDatagramFail; this.mCountOfDatagramTypeKeepAliveSuccess = builder.mCountOfDatagramTypeKeepAliveSuccess; this.mCountOfDatagramTypeKeepAliveFail = builder.mCountOfDatagramTypeKeepAliveFail; } public int getCountOfSatelliteServiceEnablementsSuccess() { Loading Loading @@ -162,6 +186,38 @@ public class SatelliteStats { return mTotalBatteryChargedTimeSec; } public int getCountOfDemoModeSatelliteServiceEnablementsSuccess() { return mCountOfDemoModeSatelliteServiceEnablementsSuccess; } public int getCountOfDemoModeSatelliteServiceEnablementsFail() { return mCountOfDemoModeSatelliteServiceEnablementsFail; } public int getCountOfDemoModeOutgoingDatagramSuccess() { return mCountOfDemoModeOutgoingDatagramSuccess; } public int getCountOfDemoModeOutgoingDatagramFail() { return mCountOfDemoModeOutgoingDatagramFail; } public int getCountOfDemoModeIncomingDatagramSuccess() { return mCountOfDemoModeIncomingDatagramSuccess; } public int getCountOfDemoModeIncomingDatagramFail() { return mCountOfDemoModeIncomingDatagramFail; } public int getCountOfDatagramTypeKeepAliveSuccess() { return mCountOfDatagramTypeKeepAliveSuccess; } public int getCountOfDatagramTypeKeepAliveFail() { return mCountOfDatagramTypeKeepAliveFail; } /** * A builder class to create {@link SatelliteControllerParams} data structure class */ Loading @@ -183,6 +239,14 @@ public class SatelliteStats { private int mTotalServiceUptimeSec = 0; private int mTotalBatteryConsumptionPercent = 0; private int mTotalBatteryChargedTimeSec = 0; private int mCountOfDemoModeSatelliteServiceEnablementsSuccess = 0; private int mCountOfDemoModeSatelliteServiceEnablementsFail = 0; private int mCountOfDemoModeOutgoingDatagramSuccess = 0; private int mCountOfDemoModeOutgoingDatagramFail = 0; private int mCountOfDemoModeIncomingDatagramSuccess = 0; private int mCountOfDemoModeIncomingDatagramFail = 0; private int mCountOfDatagramTypeKeepAliveSuccess = 0; private int mCountOfDatagramTypeKeepAliveFail = 0; /** * Sets countOfSatelliteServiceEnablementsSuccess value of {@link SatelliteController} Loading Loading @@ -346,6 +410,90 @@ public class SatelliteStats { return this; } /** * Sets countOfDemoModeSatelliteServiceEnablementsSuccess value of * {@link SatelliteController} atom then returns Builder class */ public Builder setCountOfDemoModeSatelliteServiceEnablementsSuccess( int countOfDemoModeSatelliteServiceEnablementsSuccess) { this.mCountOfDemoModeSatelliteServiceEnablementsSuccess = countOfDemoModeSatelliteServiceEnablementsSuccess; return this; } /** * Sets countOfDemoModeSatelliteServiceEnablementsFail value of * {@link SatelliteController} atom then returns Builder class */ public Builder setCountOfDemoModeSatelliteServiceEnablementsFail( int countOfDemoModeSatelliteServiceEnablementsFail) { this.mCountOfDemoModeSatelliteServiceEnablementsFail = countOfDemoModeSatelliteServiceEnablementsFail; return this; } /** * Sets countOfDemoModeOutgoingDatagramSuccess value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDemoModeOutgoingDatagramSuccess( int countOfDemoModeOutgoingDatagramSuccess) { this.mCountOfDemoModeOutgoingDatagramSuccess = countOfDemoModeOutgoingDatagramSuccess; return this; } /** * Sets countOfDemoModeOutgoingDatagramFail value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDemoModeOutgoingDatagramFail( int countOfDemoModeOutgoingDatagramFail) { this.mCountOfDemoModeOutgoingDatagramFail = countOfDemoModeOutgoingDatagramFail; return this; } /** * Sets countOfDemoModeIncomingDatagramSuccess value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDemoModeIncomingDatagramSuccess( int countOfDemoModeIncomingDatagramSuccess) { this.mCountOfDemoModeIncomingDatagramSuccess = countOfDemoModeIncomingDatagramSuccess; return this; } /** * Sets countOfDemoModeIncomingDatagramFail value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDemoModeIncomingDatagramFail( int countOfDemoModeIncomingDatagramFail) { this.mCountOfDemoModeIncomingDatagramFail = countOfDemoModeIncomingDatagramFail; return this; } /** * Sets countOfDatagramTypeKeepAliveSuccess value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDatagramTypeKeepAliveSuccess( int countOfDatagramTypeKeepAliveSuccess) { this.mCountOfDatagramTypeKeepAliveSuccess = countOfDatagramTypeKeepAliveSuccess; return this; } /** * Sets countOfDatagramTypeKeepAliveFail value of {@link SatelliteController} atom * then returns Builder class */ public Builder setCountOfDatagramTypeKeepAliveFail( int countOfDatagramTypeKeepAliveFail) { this.mCountOfDatagramTypeKeepAliveFail = countOfDatagramTypeKeepAliveFail; return this; } /** * Returns ControllerParams, which contains whole component of * {@link SatelliteController} atom Loading Loading @@ -376,6 +524,22 @@ public class SatelliteStats { + ", serviceUptimeSec=" + mTotalServiceUptimeSec + ", batteryConsumptionPercent=" + mTotalBatteryConsumptionPercent + ", batteryChargedTimeSec=" + mTotalBatteryChargedTimeSec + ", countOfDemoModeSatelliteServiceEnablementsSuccess=" + mCountOfDemoModeSatelliteServiceEnablementsSuccess + ", countOfDemoModeSatelliteServiceEnablementsFail=" + mCountOfDemoModeSatelliteServiceEnablementsFail + ", countOfDemoModeOutgoingDatagramSuccess=" + mCountOfDemoModeOutgoingDatagramSuccess + ", countOfDemoModeOutgoingDatagramFail=" + mCountOfDemoModeOutgoingDatagramFail + ", countOfDemoModeIncomingDatagramSuccess=" + mCountOfDemoModeIncomingDatagramSuccess + ", countOfDemoModeIncomingDatagramFail=" + mCountOfDemoModeIncomingDatagramFail + ", countOfDatagramTypeKeepAliveSuccess=" + mCountOfDatagramTypeKeepAliveSuccess + ", countOfDatagramTypeKeepAliveFail=" + mCountOfDatagramTypeKeepAliveFail + ")"; } } Loading @@ -395,6 +559,7 @@ public class SatelliteStats { private final int mCountOfOutgoingDatagramFailed; private final int mCountOfIncomingDatagramSuccess; private final int mCountOfIncomingDatagramFailed; private final boolean mIsDemoMode; private SatelliteSessionParams(Builder builder) { this.mSatelliteServiceInitializationResult = Loading @@ -409,6 +574,7 @@ public class SatelliteStats { this.mCountOfOutgoingDatagramFailed = builder.mCountOfOutgoingDatagramFailed; this.mCountOfIncomingDatagramSuccess = builder.mCountOfIncomingDatagramSuccess; this.mCountOfIncomingDatagramFailed = builder.mCountOfIncomingDatagramFailed; this.mIsDemoMode = builder.mIsDemoMode; } public int getSatelliteServiceInitializationResult() { Loading Loading @@ -451,6 +617,10 @@ public class SatelliteStats { return mCountOfIncomingDatagramFailed; } public boolean getIsDemoMode() { return mIsDemoMode; } /** * A builder class to create {@link SatelliteSessionParams} data structure class */ Loading @@ -465,6 +635,7 @@ public class SatelliteStats { private int mCountOfOutgoingDatagramFailed = -1; private int mCountOfIncomingDatagramSuccess = -1; private int mCountOfIncomingDatagramFailed = -1; private boolean mIsDemoMode = false; /** * Sets satelliteServiceInitializationResult value of {@link SatelliteSession} Loading Loading @@ -534,6 +705,12 @@ public class SatelliteStats { return this; } /** Sets whether enabled satellite session is for demo mode or not. */ public Builder setIsDemoMode(boolean isDemoMode) { this.mIsDemoMode = isDemoMode; return this; } /** * Returns SessionParams, which contains whole component of * {@link SatelliteSession} atom Loading @@ -557,6 +734,7 @@ public class SatelliteStats { + ", CountOfOutgoingDatagramFailed=" + mCountOfOutgoingDatagramFailed + ", CountOfIncomingDatagramSuccess=" + mCountOfIncomingDatagramSuccess + ", CountOfIncomingDatagramFailed=" + mCountOfIncomingDatagramFailed + ", IsDemoMode=" + mIsDemoMode + ")"; } } Loading @@ -569,11 +747,13 @@ public class SatelliteStats { private final int mResultCode; private final int mDatagramSizeBytes; private final long mDatagramTransferTimeMillis; private final boolean mIsDemoMode; private SatelliteIncomingDatagramParams(Builder builder) { this.mResultCode = builder.mResultCode; this.mDatagramSizeBytes = builder.mDatagramSizeBytes; this.mDatagramTransferTimeMillis = builder.mDatagramTransferTimeMillis; this.mIsDemoMode = builder.mIsDemoMode; } public int getResultCode() { Loading @@ -588,6 +768,10 @@ public class SatelliteStats { return mDatagramTransferTimeMillis; } public boolean getIsDemoMode() { return mIsDemoMode; } /** * A builder class to create {@link SatelliteIncomingDatagramParams} data structure class */ Loading @@ -595,6 +779,7 @@ public class SatelliteStats { private int mResultCode = -1; private int mDatagramSizeBytes = -1; private long mDatagramTransferTimeMillis = -1; private boolean mIsDemoMode = false; /** * Sets resultCode value of {@link SatelliteIncomingDatagram} atom Loading Loading @@ -623,6 +808,15 @@ public class SatelliteStats { return this; } /** * Sets whether transferred datagram is in demo mode or not * then returns Builder class */ public Builder setIsDemoMode(boolean isDemoMode) { this.mIsDemoMode = isDemoMode; return this; } /** * Returns IncomingDatagramParams, which contains whole component of * {@link SatelliteIncomingDatagram} atom Loading @@ -638,7 +832,9 @@ public class SatelliteStats { return "IncomingDatagramParams(" + ", resultCode=" + mResultCode + ", datagramSizeBytes=" + mDatagramSizeBytes + ", datagramTransferTimeMillis=" + mDatagramTransferTimeMillis + ")"; + ", datagramTransferTimeMillis=" + mDatagramTransferTimeMillis + ", isDemoMode=" + mIsDemoMode + ")"; } } Loading @@ -651,12 +847,14 @@ public class SatelliteStats { private final int mResultCode; private final int mDatagramSizeBytes; private final long mDatagramTransferTimeMillis; private final boolean mIsDemoMode; private SatelliteOutgoingDatagramParams(Builder builder) { this.mDatagramType = builder.mDatagramType; this.mResultCode = builder.mResultCode; this.mDatagramSizeBytes = builder.mDatagramSizeBytes; this.mDatagramTransferTimeMillis = builder.mDatagramTransferTimeMillis; this.mIsDemoMode = builder.mIsDemoMode; } public int getDatagramType() { Loading @@ -675,6 +873,10 @@ public class SatelliteStats { return mDatagramTransferTimeMillis; } public boolean getIsDemoMode() { return mIsDemoMode; } /** * A builder class to create {@link SatelliteOutgoingDatagramParams} data structure class */ Loading @@ -683,6 +885,7 @@ public class SatelliteStats { private int mResultCode = -1; private int mDatagramSizeBytes = -1; private long mDatagramTransferTimeMillis = -1; private boolean mIsDemoMode = false; /** * Sets datagramType value of {@link SatelliteOutgoingDatagram} atom Loading Loading @@ -720,6 +923,15 @@ public class SatelliteStats { return this; } /** * Sets whether transferred datagram is in demo mode or not * then returns Builder class */ public Builder setIsDemoMode(boolean isDemoMode) { this.mIsDemoMode = isDemoMode; return this; } /** * Returns OutgoingDatagramParams, which contains whole component of * {@link SatelliteOutgoingDatagram} atom Loading @@ -736,7 +948,9 @@ public class SatelliteStats { + "datagramType=" + mDatagramType + ", resultCode=" + mResultCode + ", datagramSizeBytes=" + mDatagramSizeBytes + ", datagramTransferTimeMillis=" + mDatagramTransferTimeMillis + ")"; + ", datagramTransferTimeMillis=" + mDatagramTransferTimeMillis + ", isDemoMode=" + mIsDemoMode + ")"; } } Loading Loading @@ -1016,7 +1230,18 @@ public class SatelliteStats { proto.totalServiceUptimeSec = param.getTotalServiceUptimeSec(); proto.totalBatteryConsumptionPercent = param.getTotalBatteryConsumptionPercent(); proto.totalBatteryChargedTimeSec = param.getTotalBatteryChargedTimeSec(); proto.countOfDemoModeSatelliteServiceEnablementsSuccess = param.getCountOfDemoModeSatelliteServiceEnablementsSuccess(); proto.countOfDemoModeSatelliteServiceEnablementsFail = param.getCountOfDemoModeSatelliteServiceEnablementsFail(); proto.countOfDemoModeOutgoingDatagramSuccess = param.getCountOfDemoModeOutgoingDatagramSuccess(); proto.countOfDemoModeOutgoingDatagramFail = param.getCountOfDemoModeOutgoingDatagramFail(); proto.countOfDemoModeIncomingDatagramSuccess = param.getCountOfDemoModeIncomingDatagramSuccess(); proto.countOfDemoModeIncomingDatagramFail = param.getCountOfDemoModeIncomingDatagramFail(); proto.countOfDatagramTypeKeepAliveSuccess = param.getCountOfDatagramTypeKeepAliveSuccess(); proto.countOfDatagramTypeKeepAliveFail = param.getCountOfDatagramTypeKeepAliveFail(); mAtomsStorage.addSatelliteControllerStats(proto); } Loading @@ -1035,6 +1260,7 @@ public class SatelliteStats { proto.countOfOutgoingDatagramFailed = param.getCountOfOutgoingDatagramFailed(); proto.countOfIncomingDatagramSuccess = param.getCountOfIncomingDatagramSuccess(); proto.countOfIncomingDatagramFailed = param.getCountOfOutgoingDatagramFailed(); proto.isDemoMode = param.getIsDemoMode(); mAtomsStorage.addSatelliteSessionStats(proto); } Loading @@ -1045,6 +1271,7 @@ public class SatelliteStats { proto.resultCode = param.getResultCode(); proto.datagramSizeBytes = param.getDatagramSizeBytes(); proto.datagramTransferTimeMillis = param.getDatagramTransferTimeMillis(); proto.isDemoMode = param.getIsDemoMode(); mAtomsStorage.addSatelliteIncomingDatagramStats(proto); } Loading @@ -1056,6 +1283,7 @@ public class SatelliteStats { proto.resultCode = param.getResultCode(); proto.datagramSizeBytes = param.getDatagramSizeBytes(); proto.datagramTransferTimeMillis = param.getDatagramTransferTimeMillis(); proto.isDemoMode = param.getIsDemoMode(); mAtomsStorage.addSatelliteOutgoingDatagramStats(proto); } Loading
src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java +9 −5 File changed.Preview size limit exceeded, changes collapsed. Show changes