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

Commit 36664cac authored by Joonhun Shin's avatar Joonhun Shin Committed by Android (Google) Code Review
Browse files

Merge "add is_opportunistic into related atoms" into main

parents 53895b42 08aafb13

proto/src/persist_atoms.proto

+2 −0
Original line number Original line Diff line number Diff line
@@ -441,6 +441,7 @@ message CellularServiceState { 
    optional bool is_iwlan_cross_sim = 15;

    optional bool is_iwlan_cross_sim = 15;

    optional bool is_ntn = 16;

    optional bool is_ntn = 16;

    optional bool is_nb_iot_ntn = 17;

    optional bool is_nb_iot_ntn = 17;

    optional bool is_opportunistic = 18;





    // Internal use only

    // Internal use only

    optional int64 last_used_millis = 10001;

    optional int64 last_used_millis = 10001;
@@ -453,6 +454,7 @@ message CellularDataServiceSwitch { 
    optional bool is_multi_sim = 4;

    optional bool is_multi_sim = 4;

    optional int32 carrier_id = 5;

    optional int32 carrier_id = 5;

    optional int32 switch_count = 6;

    optional int32 switch_count = 6;

    optional bool is_opportunistic = 7;





    // Internal use only

    // Internal use only

    optional int64 last_used_millis = 10001;

    optional int64 last_used_millis = 10001;

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -1064,7 +1064,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
                serviceSwitch.simSlotIndex,

                serviceSwitch.simSlotIndex,

                serviceSwitch.isMultiSim,

                serviceSwitch.isMultiSim,

                serviceSwitch.carrierId,

                serviceSwitch.carrierId,

                serviceSwitch.switchCount);

                serviceSwitch.switchCount,

                serviceSwitch.isOpportunistic);

    }

    }





    private static StatsEvent buildStatsEvent(CellularServiceState state) {

    private static StatsEvent buildStatsEvent(CellularServiceState state) {
@@ -1087,7 +1088,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
                state.isDataEnabled,

                state.isDataEnabled,

                state.isIwlanCrossSim,

                state.isIwlanCrossSim,

                state.isNtn,

                state.isNtn,

                state.isNbIotNtn);

                state.isNbIotNtn,

                state.isOpportunistic);

    }

    }





    private static StatsEvent buildStatsEvent(VoiceCallRatUsage usage) {

    private static StatsEvent buildStatsEvent(VoiceCallRatUsage usage) {

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -2013,7 +2013,8 @@ public class PersistAtomsStorage { 
                    && state.isDataEnabled == key.isDataEnabled

                    && state.isDataEnabled == key.isDataEnabled

                    && state.isIwlanCrossSim == key.isIwlanCrossSim

                    && state.isIwlanCrossSim == key.isIwlanCrossSim

                    && state.isNtn == key.isNtn

                    && state.isNtn == key.isNtn

                    && state.isNbIotNtn == key.isNbIotNtn) {

                    && state.isNbIotNtn == key.isNbIotNtn

                    && state.isOpportunistic == key.isOpportunistic) {

                return state;

                return state;

            }

            }

        }

        }
@@ -2030,7 +2031,8 @@ public class PersistAtomsStorage { 
                    && serviceSwitch.ratTo == key.ratTo

                    && serviceSwitch.ratTo == key.ratTo

                    && serviceSwitch.simSlotIndex == key.simSlotIndex

                    && serviceSwitch.simSlotIndex == key.simSlotIndex

                    && serviceSwitch.isMultiSim == key.isMultiSim

                    && serviceSwitch.isMultiSim == key.isMultiSim

                    && serviceSwitch.carrierId == key.carrierId) {

                    && serviceSwitch.carrierId == key.carrierId

                    && serviceSwitch.isOpportunistic == key.isOpportunistic) {

                return serviceSwitch;

                return serviceSwitch;

            }

            }

        }

        }