Merge "Fix typo"
diff --git a/proto/src/telephony.proto b/proto/src/telephony.proto
index 1a56bad..78dee95 100644
--- a/proto/src/telephony.proto
+++ b/proto/src/telephony.proto
@@ -706,7 +706,7 @@
optional PdpType type = 2;
// The network interface name e.g. wlan0, rmnet_data0.
- optional string iframe = 3;
+ optional string ifname = 3;
// State of the Data Call connection
optional State state = 4;
diff --git a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
index fe0b82c..627d20d 100644
--- a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
+++ b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
@@ -1775,7 +1775,7 @@
dataCall.type = response.getProtocolType() + 1;
if (!TextUtils.isEmpty(response.getInterfaceName())) {
- dataCall.iframe = response.getInterfaceName();
+ dataCall.ifname = response.getInterfaceName();
}
}
setupDataCallResponse.call = dataCall;
diff --git a/tests/telephonytests/src/com/android/internal/telephony/metrics/TelephonyMetricsTest.java b/tests/telephonytests/src/com/android/internal/telephony/metrics/TelephonyMetricsTest.java
index c6cc266..e5d9563 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/metrics/TelephonyMetricsTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/metrics/TelephonyMetricsTest.java
@@ -536,7 +536,7 @@
assertEquals(6, respProto.suggestedRetryTimeMillis);
assertEquals(7, respProto.call.cid);
assertEquals(PDP_TYPE_IPV4V6, respProto.call.type);
- assertEquals(FAKE_IFNAME, respProto.call.iframe);
+ assertEquals(FAKE_IFNAME, respProto.call.ifname);
}
// Test write on deactivate data call response
