summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author joonhunshin <joonhunshin@google.com> 2025-03-21 07:37:18 +0000
committer joonhunshin <joonhunshin@google.com> 2025-03-21 10:05:39 +0000
commit08aafb133de3134546a7b6220c770284e3e7a3cf (patch)
tree44b39c110ff2aaee30dbecd50ee2e1213eaedb5d
parentdf35ff6aeb802c9b5daec1f77ea5592460b38d86 (diff)
add is_opportunistic into related atoms
It is needed whether the subscription is an opprtunistic. Related Atoms : CellularServiceState, CellularDataServiceSwitch Flag: EXEMPT bug fix Bug: 405260276 Test: build test Change-Id: I53f3c5160c7c54a0e484a8692eff7924e40e82e2
-rw-r--r--proto/src/persist_atoms.proto2
-rw-r--r--src/java/com/android/internal/telephony/metrics/MetricsCollector.java6
-rw-r--r--src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java6
3 files changed, 10 insertions, 4 deletions
diff --git a/proto/src/persist_atoms.proto b/proto/src/persist_atoms.proto
index c2385aee21..d6dff87b83 100644
--- a/proto/src/persist_atoms.proto
+++ b/proto/src/persist_atoms.proto
@@ -441,6 +441,7 @@ message CellularServiceState {
optional bool is_iwlan_cross_sim = 15;
optional bool is_ntn = 16;
optional bool is_nb_iot_ntn = 17;
+ optional bool is_opportunistic = 18;
// Internal use only
optional int64 last_used_millis = 10001;
@@ -453,6 +454,7 @@ message CellularDataServiceSwitch {
optional bool is_multi_sim = 4;
optional int32 carrier_id = 5;
optional int32 switch_count = 6;
+ optional bool is_opportunistic = 7;
// Internal use only
optional int64 last_used_millis = 10001;
diff --git a/src/java/com/android/internal/telephony/metrics/MetricsCollector.java b/src/java/com/android/internal/telephony/metrics/MetricsCollector.java
index 31f4738e01..1bbfddb4ca 100644
--- a/src/java/com/android/internal/telephony/metrics/MetricsCollector.java
+++ b/src/java/com/android/internal/telephony/metrics/MetricsCollector.java
@@ -1064,7 +1064,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
serviceSwitch.simSlotIndex,
serviceSwitch.isMultiSim,
serviceSwitch.carrierId,
- serviceSwitch.switchCount);
+ serviceSwitch.switchCount,
+ serviceSwitch.isOpportunistic);
}
private static StatsEvent buildStatsEvent(CellularServiceState state) {
@@ -1087,7 +1088,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
state.isDataEnabled,
state.isIwlanCrossSim,
state.isNtn,
- state.isNbIotNtn);
+ state.isNbIotNtn,
+ state.isOpportunistic);
}
private static StatsEvent buildStatsEvent(VoiceCallRatUsage usage) {
diff --git a/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java b/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
index 9408ffa899..b3530789dd 100644
--- a/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
+++ b/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
@@ -2013,7 +2013,8 @@ public class PersistAtomsStorage {
&& state.isDataEnabled == key.isDataEnabled
&& state.isIwlanCrossSim == key.isIwlanCrossSim
&& state.isNtn == key.isNtn
- && state.isNbIotNtn == key.isNbIotNtn) {
+ && state.isNbIotNtn == key.isNbIotNtn
+ && state.isOpportunistic == key.isOpportunistic) {
return state;
}
}
@@ -2030,7 +2031,8 @@ public class PersistAtomsStorage {
&& serviceSwitch.ratTo == key.ratTo
&& serviceSwitch.simSlotIndex == key.simSlotIndex
&& serviceSwitch.isMultiSim == key.isMultiSim
- && serviceSwitch.carrierId == key.carrierId) {
+ && serviceSwitch.carrierId == key.carrierId
+ && serviceSwitch.isOpportunistic == key.isOpportunistic) {
return serviceSwitch;
}
}