Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8c7603a authored by Hakjun Choi's avatar Hakjun Choi Committed by Automerger Merge Worker
Browse files

Add max signal level into satellite session metrics am: e207f934 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/27234358



Change-Id: I4fa87716008a009a148f719c8f327e855ada6e53
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65fea8f2 e207f934

proto/src/persist_atoms.proto

+1 −0
Original line number Diff line number Diff line
@@ -719,6 +719,7 @@ message SatelliteSession { 
    optional int32 count_of_incoming_datagram_success = 10;

    optional int32 count_of_incoming_datagram_failed = 11;

    optional bool is_demo_mode = 12;

    optional int32 max_ntn_signal_strength_level = 13;

}



message SatelliteIncomingDatagram {

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

+2 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
                satelliteSession.countOfOutgoingDatagramFailed,

                satelliteSession.countOfIncomingDatagramSuccess,

                satelliteSession.countOfIncomingDatagramFailed,

                satelliteSession.isDemoMode);

                satelliteSession.isDemoMode,

                satelliteSession.maxNtnSignalStrengthLevel);

    }



    private static StatsEvent buildStatsEvent(SatelliteIncomingDatagram stats) {

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

+4 −3
Original line number Diff line number Diff line
@@ -2275,7 +2275,7 @@ public class PersistAtomsStorage { 
    }



    /**

     * Returns SatelliteOutgoingDatagram atom that has same values or {@code null}

     * Returns SatelliteSession atom that has same values or {@code null}

     * if it does not exist.

     */

    private @Nullable SatelliteSession find(
@@ -2294,7 +2294,8 @@ public class PersistAtomsStorage { 
                    && stats.countOfOutgoingDatagramFailed == key.countOfOutgoingDatagramFailed

                    && stats.countOfIncomingDatagramSuccess == key.countOfIncomingDatagramSuccess

                    && stats.countOfIncomingDatagramFailed == key.countOfIncomingDatagramFailed

                    && stats.isDemoMode == key.isDemoMode) {

                    && stats.isDemoMode == key.isDemoMode

                    && stats.maxNtnSignalStrengthLevel == key.maxNtnSignalStrengthLevel) {

                return stats;

            }

        }
@@ -2302,7 +2303,7 @@ public class PersistAtomsStorage { 
    }



    /**

     * Returns SatelliteOutgoingDatagram atom that has same values or {@code null}

     * Returns SatelliteSosMessageRecommender atom that has same values or {@code null}

     * if it does not exist.

     */

    private @Nullable SatelliteSosMessageRecommender find(

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

+20 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.internal.telephony.metrics;



import static android.telephony.satellite.NtnSignalStrength.NTN_SIGNAL_STRENGTH_NONE;



import android.telephony.satellite.NtnSignalStrength;

import android.telephony.satellite.SatelliteManager;



import com.android.internal.telephony.PhoneFactory;
@@ -568,6 +571,7 @@ public class SatelliteStats { 
        private final int mCountOfIncomingDatagramSuccess;

        private final int mCountOfIncomingDatagramFailed;

        private final boolean mIsDemoMode;

        private final @NtnSignalStrength.NtnSignalStrengthLevel int mMaxNtnSignalStrengthLevel;



        private SatelliteSessionParams(Builder builder) {

            this.mSatelliteServiceInitializationResult =
@@ -583,6 +587,7 @@ public class SatelliteStats { 
            this.mCountOfIncomingDatagramSuccess = builder.mCountOfIncomingDatagramSuccess;

            this.mCountOfIncomingDatagramFailed = builder.mCountOfIncomingDatagramFailed;

            this.mIsDemoMode = builder.mIsDemoMode;

            this.mMaxNtnSignalStrengthLevel = builder.mMaxNtnSignalStrengthLevel;

        }



        public int getSatelliteServiceInitializationResult() {
@@ -629,6 +634,10 @@ public class SatelliteStats { 
            return mIsDemoMode;

        }



        public @NtnSignalStrength.NtnSignalStrengthLevel int getMaxNtnSignalStrengthLevel() {

            return mMaxNtnSignalStrengthLevel;

        }



        /**

         * A builder class to create {@link SatelliteSessionParams} data structure class

         */
@@ -644,6 +653,8 @@ public class SatelliteStats { 
            private int mCountOfIncomingDatagramSuccess = -1;

            private int mCountOfIncomingDatagramFailed = -1;

            private boolean mIsDemoMode = false;

            private @NtnSignalStrength.NtnSignalStrengthLevel int mMaxNtnSignalStrengthLevel =

                    NTN_SIGNAL_STRENGTH_NONE;



            /**

             * Sets satelliteServiceInitializationResult value of {@link SatelliteSession}
@@ -719,6 +730,13 @@ public class SatelliteStats { 
                return this;

            }



            /** Sets the max ntn signal strength for the satellite session */

            public Builder setMaxNtnSignalStrengthLevel(

                    @NtnSignalStrength.NtnSignalStrengthLevel int maxNtnSignalStrengthLevel) {

                this.mMaxNtnSignalStrengthLevel = maxNtnSignalStrengthLevel;

                return this;

            }



            /**

             * Returns SessionParams, which contains whole component of

             * {@link SatelliteSession} atom
@@ -743,6 +761,7 @@ public class SatelliteStats { 
                    + ", CountOfIncomingDatagramSuccess=" + mCountOfIncomingDatagramSuccess

                    + ", CountOfIncomingDatagramFailed=" + mCountOfIncomingDatagramFailed

                    + ", IsDemoMode=" + mIsDemoMode

                    + ", MaxNtnSignalStrengthLevel=" + mMaxNtnSignalStrengthLevel

                    + ")";

        }

    }
@@ -1954,6 +1973,7 @@ public class SatelliteStats { 
        proto.countOfIncomingDatagramSuccess = param.getCountOfIncomingDatagramSuccess();

        proto.countOfIncomingDatagramFailed = param.getCountOfOutgoingDatagramFailed();

        proto.isDemoMode = param.getIsDemoMode();

        proto.maxNtnSignalStrengthLevel = param.getMaxNtnSignalStrengthLevel();

        mAtomsStorage.addSatelliteSessionStats(proto);

    }

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+1 −0
Original line number Diff line number Diff line
@@ -3439,6 +3439,7 @@ public class SatelliteController extends Handler { 
        synchronized (mNtnSignalsStrengthLock) {

            mNtnSignalStrength = ntnSignalStrength;

        }

        mSessionMetricsStats.updateMaxNtnSignalStrengthLevel(ntnSignalStrength.getLevel());



        List<INtnSignalStrengthCallback> deadCallersList = new ArrayList<>();

        mNtnSignalStrengthChangedListeners.values().forEach(listener -> {