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

Commit 0558b7a7 authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Fix typo" am: 4d1d5049 am: 7b960ad0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1618920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40d2fea8025026409c00c041bf21433452c487af
parents 4d7dd6a1 7b960ad0

proto/src/telephony.proto

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ message RilDataCall { 
  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;

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

+1 −1
Original line number Diff line number Diff line
@@ -1775,7 +1775,7 @@ public class TelephonyMetrics { 
            dataCall.type = response.getProtocolType() + 1;



            if (!TextUtils.isEmpty(response.getInterfaceName())) {

                dataCall.iframe = response.getInterfaceName();

                dataCall.ifname = response.getInterfaceName();

            }

        }

        setupDataCallResponse.call = dataCall;

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

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ public class TelephonyMetricsTest extends TelephonyTest { 
        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