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

Commit e5936c28 authored Apr 21, 2020 by Sarah Chin

Switch dynamic not metered to temp not metered

Test: atest TelephonyMetricsTest
Bug: 153369071
Change-Id: I144b0f9af1765c8ada578adc67dd4a55811b10eb
Merged-In: I144b0f9af1765c8ada578adc67dd4a55811b10eb

parent 2f3350dd

src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -238,9 +238,9 @@ public class DcNetworkAgent extends NetworkAgent {
	// only log metrics for DataConnection with NET_CAPABILITY_INTERNET		// only log metrics for DataConnection with NET_CAPABILITY_INTERNET
	if (mNetworkCapabilities == null		if (mNetworkCapabilities == null
	\|\| networkCapabilities.hasCapability(		\|\| networkCapabilities.hasCapability(
	NetworkCapabilities.NET_CAPABILITY_NOT_METERED)		NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)
	!= mNetworkCapabilities.hasCapability(		!= mNetworkCapabilities.hasCapability(
	NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) {		NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)) {
	TelephonyMetrics.getInstance().writeNetworkCapabilitiesChangedEvent(		TelephonyMetrics.getInstance().writeNetworkCapabilitiesChangedEvent(
	mPhone.getPhoneId(), networkCapabilities);		mPhone.getPhoneId(), networkCapabilities);
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2588,7 +2588,7 @@ public class TelephonyMetrics {
	NetworkCapabilities networkCapabilities) {		NetworkCapabilities networkCapabilities) {
	final NetworkCapabilitiesInfo caps = new NetworkCapabilitiesInfo();		final NetworkCapabilitiesInfo caps = new NetworkCapabilitiesInfo();
	caps.isNetworkUnmetered = networkCapabilities.hasCapability(		caps.isNetworkUnmetered = networkCapabilities.hasCapability(
	NetworkCapabilities.NET_CAPABILITY_NOT_METERED);		NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED);

	TelephonyEvent event = new TelephonyEventBuilder(phoneId)		TelephonyEvent event = new TelephonyEventBuilder(phoneId)
	.setNetworkCapabilities(caps).build();		.setNetworkCapabilities(caps).build();

tests/telephonytests/src/com/android/internal/telephony/metrics/TelephonyMetricsTest.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -312,10 +312,10 @@ public class TelephonyMetricsTest extends TelephonyTest {
	@SmallTest		@SmallTest
	public void testWriteNetworkCapabilitiesChangedEvent() throws Exception {		public void testWriteNetworkCapabilitiesChangedEvent() throws Exception {
	NetworkCapabilities caps = new NetworkCapabilities();		NetworkCapabilities caps = new NetworkCapabilities();
	caps.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);		caps.addCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED);
	mMetrics.writeNetworkCapabilitiesChangedEvent(mPhone.getPhoneId(), caps);		mMetrics.writeNetworkCapabilitiesChangedEvent(mPhone.getPhoneId(), caps);

	caps.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);		caps.removeCapability(NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED);
	mMetrics.writeNetworkCapabilitiesChangedEvent(mPhone.getPhoneId(), caps);		mMetrics.writeNetworkCapabilitiesChangedEvent(mPhone.getPhoneId(), caps);

	TelephonyLog log = buildProto();		TelephonyLog log = buildProto();