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

Commit b36eda15 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add new DeviceTelephonyProperties atom for isUsingNewDataStack" into... 

Merge "Add new DeviceTelephonyProperties atom for isUsingNewDataStack" into tm-dev am: 5a035805 am: c8ff45f1 am: 3696965d

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



Change-Id: I58e4ac90345a769913bafa345f76dc35754cdd05
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 270a65e2 3696965d

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

+15 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.internal.telephony.TelephonyStatsLog.CARRIER_ID_TABLE_ 
import static com.android.internal.telephony.TelephonyStatsLog.CELLULAR_DATA_SERVICE_SWITCH;

import static com.android.internal.telephony.TelephonyStatsLog.CELLULAR_SERVICE_STATE;

import static com.android.internal.telephony.TelephonyStatsLog.DATA_CALL_SESSION;

import static com.android.internal.telephony.TelephonyStatsLog.DEVICE_TELEPHONY_PROPERTIES;

import static com.android.internal.telephony.TelephonyStatsLog.GBA_EVENT;

import static com.android.internal.telephony.TelephonyStatsLog.IMS_DEDICATED_BEARER_EVENT;

import static com.android.internal.telephony.TelephonyStatsLog.IMS_DEDICATED_BEARER_LISTENER_EVENT;
@@ -166,6 +167,7 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
            registerAtom(SIP_TRANSPORT_FEATURE_TAG_STATS, POLICY_PULL_DAILY);

            registerAtom(SIP_MESSAGE_RESPONSE, POLICY_PULL_DAILY);

            registerAtom(SIP_TRANSPORT_SESSION, POLICY_PULL_DAILY);

            registerAtom(DEVICE_TELEPHONY_PROPERTIES, null);

            registerAtom(IMS_DEDICATED_BEARER_LISTENER_EVENT, POLICY_PULL_DAILY);

            registerAtom(IMS_DEDICATED_BEARER_EVENT, POLICY_PULL_DAILY);

            registerAtom(IMS_REGISTRATION_SERVICE_DESC_STATS, POLICY_PULL_DAILY);
@@ -218,6 +220,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
                return pullImsRegistrationTermination(data);

            case TELEPHONY_NETWORK_REQUESTS_V2:

                return pullTelephonyNetworkRequestsV2(data);

            case DEVICE_TELEPHONY_PROPERTIES:

                return pullDeviceTelephonyProperties(data);

            case IMS_REGISTRATION_FEATURE_TAG_STATS:

                return pullImsRegistrationFeatureTagStats(data);

            case RCS_CLIENT_PROVISIONING_STATS:
@@ -472,6 +476,17 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
        }

    }



    private static int pullDeviceTelephonyProperties(List<StatsEvent> data) {

        Phone[] phones = getPhonesIfAny();

        if (phones.length == 0) {

            return StatsManager.PULL_SKIP;

        }



        data.add(TelephonyStatsLog.buildStatsEvent(DEVICE_TELEPHONY_PROPERTIES,

                phones[0].isUsingNewDataStack()));

        return StatsManager.PULL_SUCCESS;

    }



    private int pullImsRegistrationFeatureTagStats(List<StatsEvent> data) {

        RcsStats.getInstance().onFlushIncompleteImsRegistrationFeatureTagStats();