Merge "Add isDataEnabled field." into main
diff --git a/proto/src/persist_atoms.proto b/proto/src/persist_atoms.proto
index 5205616..722cb7c 100644
--- a/proto/src/persist_atoms.proto
+++ b/proto/src/persist_atoms.proto
@@ -381,6 +381,7 @@
optional bool is_internet_pdn_up = 11;
optional int32 fold_state = 12;
optional bool override_voice_service = 13;
+ optional bool isDataEnabled = 14;
// 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 a04a63a..1a53ee6 100644
--- a/src/java/com/android/internal/telephony/metrics/MetricsCollector.java
+++ b/src/java/com/android/internal/telephony/metrics/MetricsCollector.java
@@ -933,7 +933,8 @@
state.isEmergencyOnly,
state.isInternetPdnUp,
state.foldState,
- state.overrideVoiceService);
+ state.overrideVoiceService,
+ state.isDataEnabled);
}
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 c3312e1..d495ca2 100644
--- a/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
+++ b/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
@@ -1710,7 +1710,8 @@
&& state.isEmergencyOnly == key.isEmergencyOnly
&& state.isInternetPdnUp == key.isInternetPdnUp
&& state.foldState == key.foldState
- && state.overrideVoiceService == key.overrideVoiceService) {
+ && state.overrideVoiceService == key.overrideVoiceService
+ && state.isDataEnabled == key.isDataEnabled) {
return state;
}
}
diff --git a/src/java/com/android/internal/telephony/metrics/ServiceStateStats.java b/src/java/com/android/internal/telephony/metrics/ServiceStateStats.java
index 982a8f5..14ce2cc 100644
--- a/src/java/com/android/internal/telephony/metrics/ServiceStateStats.java
+++ b/src/java/com/android/internal/telephony/metrics/ServiceStateStats.java
@@ -131,6 +131,7 @@
newState.isInternetPdnUp = isInternetPdnUp(mPhone);
newState.foldState = mDeviceStateHelper.getFoldState();
newState.overrideVoiceService = mOverrideVoiceService.get();
+ newState.isDataEnabled = mPhone.getDataSettingsManager().isDataEnabled();
TimestampedServiceState prevState =
mLastState.getAndSet(new TimestampedServiceState(newState, now));
addServiceStateAndSwitch(
@@ -300,6 +301,7 @@
copy.isInternetPdnUp = state.isInternetPdnUp;
copy.foldState = state.foldState;
copy.overrideVoiceService = state.overrideVoiceService;
+ copy.isDataEnabled = state.isDataEnabled;
return copy;
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/metrics/ServiceStateStatsTest.java b/tests/telephonytests/src/com/android/internal/telephony/metrics/ServiceStateStatsTest.java
index 5d7eb9c..2509b8c 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/metrics/ServiceStateStatsTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/metrics/ServiceStateStatsTest.java
@@ -158,6 +158,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
verifyNoMoreInteractions(mPersistAtomsStorage);
}
@@ -330,6 +331,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = captor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.dataRat);
@@ -342,6 +344,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
verifyNoMoreInteractions(mPersistAtomsStorage);
}
@@ -379,6 +382,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = captor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_IWLAN, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_UNKNOWN, state.dataRat);
@@ -391,6 +395,7 @@
assertEquals(200L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
verifyNoMoreInteractions(mPersistAtomsStorage);
}
@@ -425,6 +430,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = captor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.dataRat);
@@ -466,6 +472,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
verifyNoMoreInteractions(mPersistAtomsStorage);
}
@@ -504,6 +511,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = serviceStateCaptor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.dataRat);
@@ -516,6 +524,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
CellularDataServiceSwitch serviceSwitch = serviceSwitchCaptor.getAllValues().get(0);
assertEquals(TelephonyManager.NETWORK_TYPE_UNKNOWN, serviceSwitch.ratFrom);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, serviceSwitch.ratTo);
@@ -557,6 +566,7 @@
assertEquals(CARRIER1_ID, state.carrierId);
assertEquals(100L, state.totalTimeMillis);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = captor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_IWLAN, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.dataRat);
@@ -568,6 +578,7 @@
assertEquals(CARRIER1_ID, state.carrierId);
assertEquals(100L, state.totalTimeMillis);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
verifyNoMoreInteractions(mPersistAtomsStorage);
}
@@ -597,6 +608,7 @@
assertEquals(0L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
verifyNoMoreInteractions(mPersistAtomsStorage);
}
@@ -638,6 +650,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = captor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.dataRat);
@@ -650,6 +663,7 @@
assertEquals(200L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = captor.getAllValues().get(2);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.dataRat);
@@ -662,6 +676,7 @@
assertEquals(400L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = captor.getAllValues().get(3);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.dataRat);
@@ -674,6 +689,7 @@
assertEquals(800L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
verifyNoMoreInteractions(mPersistAtomsStorage);
}
@@ -719,6 +735,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = captor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_UNKNOWN, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_UNKNOWN, state.dataRat);
@@ -731,6 +748,7 @@
assertEquals(5000L, state.totalTimeMillis);
assertEquals(true, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = captor.getAllValues().get(2);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.dataRat);
@@ -743,6 +761,7 @@
assertEquals(200L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
verifyNoMoreInteractions(mPersistAtomsStorage);
}
@@ -808,6 +827,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = serviceStateCaptor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, state.dataRat);
@@ -820,6 +840,7 @@
assertEquals(200L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = serviceStateCaptor.getAllValues().get(2);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, state.dataRat);
@@ -832,6 +853,7 @@
assertEquals(400L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
CellularDataServiceSwitch serviceSwitch = serviceSwitchCaptor.getAllValues().get(0);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, serviceSwitch.ratFrom);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, serviceSwitch.ratTo);
@@ -888,6 +910,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = serviceStateCaptor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, state.dataRat);
@@ -901,6 +924,7 @@
assertEquals(400L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
CellularDataServiceSwitch serviceSwitch = serviceSwitchCaptor.getAllValues().get(0);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, serviceSwitch.ratFrom);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, serviceSwitch.ratTo);
@@ -957,6 +981,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = serviceStateCaptor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.dataRat);
@@ -969,6 +994,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = serviceStateCaptor.getAllValues().get(2);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, state.dataRat);
@@ -981,6 +1007,7 @@
assertEquals(200L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = serviceStateCaptor.getAllValues().get(3);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, state.dataRat);
@@ -993,6 +1020,7 @@
assertEquals(200L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
CellularDataServiceSwitch serviceSwitch = serviceSwitchCaptor.getAllValues().get(0);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, serviceSwitch.ratFrom);
assertEquals(TelephonyManager.NETWORK_TYPE_UMTS, serviceSwitch.ratTo);
@@ -1054,6 +1082,7 @@
assertEquals(100L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
state = captor.getAllValues().get(1);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.voiceRat);
assertEquals(TelephonyManager.NETWORK_TYPE_LTE, state.dataRat);
@@ -1066,6 +1095,7 @@
assertEquals(200L, state.totalTimeMillis);
assertEquals(false, state.isEmergencyOnly);
assertEquals(true, state.isInternetPdnUp);
+ assertEquals(true, state.isDataEnabled);
verifyNoMoreInteractions(mPersistAtomsStorage);
}
@@ -1320,6 +1350,7 @@
doReturn(1).when(mSecondPhone).getPhoneId();
doReturn(1).when(mUiccController).getSlotIdFromPhoneId(1);
doReturn(carrierId).when(mSecondPhone).getCarrierId();
+ doReturn(mDataSettingsManager).when(mSecondPhone).getDataSettingsManager();
doReturn(true).when(mPhysicalSlot1).isActive();
doReturn(CardState.CARDSTATE_PRESENT).when(mPhysicalSlot1).getCardState();