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

Commit b8388ca4 authored by Shuo Qian's avatar Shuo Qian
Browse files

Invoke 5G metrics for NetworkRequestsStats 

Test: Treehugger
Bug: 182842539
Change-Id: I1da7499998821f01668304ba97c365e99c1ab1b8
parent 1faf70e1

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

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.internal.telephony.SubscriptionController; 
import com.android.internal.telephony.dataconnection.DcTracker.ReleaseNetworkType;

import com.android.internal.telephony.dataconnection.DcTracker.RequestNetworkType;

import com.android.internal.telephony.dataconnection.TransportManager.HandoverParams;

import com.android.internal.telephony.metrics.NetworkRequestsStats;

import com.android.internal.util.IndentingPrintWriter;

import com.android.telephony.Rlog;
@@ -230,6 +231,7 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
     */

    private void requestNetworkInternal(NetworkRequest networkRequest,

            @RequestNetworkType int requestType, int transport, Message onHandoverCompleteMsg) {

        NetworkRequestsStats.addNetworkRequest(networkRequest, mSubscriptionId);

        if (mPhone.getDcTracker(transport) != null) {

            mPhone.getDcTracker(transport).requestNetwork(networkRequest, requestType,

                    onHandoverCompleteMsg);
@@ -239,6 +241,7 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
    private void releaseNetworkInternal(NetworkRequest networkRequest,

                                        @ReleaseNetworkType int releaseType,

                                        int transport) {

        NetworkRequestsStats.addNetworkRelease(networkRequest, mSubscriptionId);

        if (mPhone.getDcTracker(transport) != null) {

            mPhone.getDcTracker(transport).releaseNetwork(networkRequest, releaseType);

        }

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

+14 −4
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.internal.telephony.metrics;



import android.net.NetworkCapabilities;

import android.net.NetworkRequest;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -28,8 +30,12 @@ import com.android.internal.telephony.nano.PersistAtomsProto.NetworkRequests; 
public class NetworkRequestsStats {

    private NetworkRequestsStats() { }



    /** Generate metrics when enterprise network request occurs. */

    public static void addEnterpriseRequest(int subId) {

    /** Generate metrics when network request occurs. */

    public static void addNetworkRequest(NetworkRequest networkRequest, int subId) {

        if (!networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_ENTERPRISE)) {

            // Currently only handle enterprise

            return;

        }

        NetworkRequests networkRequests = new NetworkRequests();

        networkRequests.carrierId = getCarrierId(subId);

        networkRequests.enterpriseRequestCount = 1;
@@ -38,8 +44,12 @@ public class NetworkRequestsStats { 
        storage.addNetworkRequests(networkRequests);

    }



    /** Generate metrics when enterprise network release occurs. */

    public static void addEnterpriseRelease(int subId) {

    /** Generate metrics when network release occurs. */

    public static void addNetworkRelease(NetworkRequest networkRequest, int subId) {

        if (!networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_ENTERPRISE)) {

            // Currently only handle enterprise

            return;

        }

        NetworkRequests networkRequests = new NetworkRequests();

        networkRequests.carrierId = getCarrierId(subId);

        networkRequests.enterpriseReleaseCount = 1;