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

Commit ec27a4e4 authored by Chi Zhang's avatar Chi Zhang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add dump reset for rcs metrics"" into tm-d1-dev am: 33527944 

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



Change-Id: Ib45e1ed952d609be00686d66601bf11c969a6a19
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0da89122 33527944

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

+0 −82
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ import android.telephony.ims.FeatureTagState; 
import android.telephony.ims.RcsContactPresenceTuple;

import android.telephony.ims.RcsContactUceCapability;

import android.telephony.ims.aidl.IRcsConfigCallback;

import android.util.Base64;

import android.util.IndentingPrintWriter;



import com.android.ims.rcs.uce.UceStatsWriter;
@@ -83,7 +82,6 @@ import com.android.telephony.Rlog; 


import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.HashSet;

import java.util.List;
@@ -1777,84 +1775,4 @@ public class RcsStats { 
        }

        pw.decreaseIndent();

    }



    /**

     * Reset all events

     */

    public synchronized void reset() {

        if (mAtomsStorage == null || mAtomsStorage.mAtoms == null) {

            return;

        }



        PersistAtomsProto.PersistAtoms metricAtoms = mAtomsStorage.mAtoms;



        metricAtoms.imsRegistrationFeatureTagStats =

                PersistAtomsProto.ImsRegistrationFeatureTagStats.emptyArray();

        metricAtoms.rcsClientProvisioningStats =

                PersistAtomsProto.RcsClientProvisioningStats.emptyArray();

        metricAtoms.rcsAcsProvisioningStats =

                PersistAtomsProto.RcsAcsProvisioningStats.emptyArray();

        metricAtoms.sipDelegateStats = PersistAtomsProto.SipDelegateStats.emptyArray();

        metricAtoms.sipTransportFeatureTagStats =

                PersistAtomsProto.SipTransportFeatureTagStats.emptyArray();

        metricAtoms.sipMessageResponse = PersistAtomsProto.SipMessageResponse.emptyArray();

        metricAtoms.sipTransportSession = PersistAtomsProto.SipTransportSession.emptyArray();

        metricAtoms.imsDedicatedBearerListenerEvent =

                PersistAtomsProto.ImsDedicatedBearerListenerEvent.emptyArray();

        metricAtoms.imsDedicatedBearerEvent =

                PersistAtomsProto.ImsDedicatedBearerEvent.emptyArray();

        metricAtoms.imsRegistrationServiceDescStats =

                PersistAtomsProto.ImsRegistrationServiceDescStats.emptyArray();

        metricAtoms.uceEventStats = PersistAtomsProto.UceEventStats.emptyArray();

        metricAtoms.presenceNotifyEvent = PersistAtomsProto.PresenceNotifyEvent.emptyArray();

        metricAtoms.gbaEvent = PersistAtomsProto.GbaEvent.emptyArray();

    }



    /**

     * Convert the PersistAtomsProto into Base-64 encoded string

     *

     * @return Encoded string

     */

    public String buildLog() {

        PersistAtomsProto.PersistAtoms log = buildProto();

        return Base64.encodeToString(

                PersistAtomsProto.PersistAtoms.toByteArray(log), Base64.DEFAULT);

    }



    /**

     * Build the PersistAtomsProto

     *

     * @return PersistAtomsProto.PersistAtoms

     */

    public PersistAtomsProto.PersistAtoms buildProto() {

        PersistAtomsProto.PersistAtoms log = new PersistAtomsProto.PersistAtoms();



        PersistAtomsProto.PersistAtoms atoms = mAtomsStorage.mAtoms;

        log.imsRegistrationFeatureTagStats = Arrays.copyOf(atoms.imsRegistrationFeatureTagStats,

                atoms.imsRegistrationFeatureTagStats.length);

        log.rcsClientProvisioningStats = Arrays.copyOf(atoms.rcsClientProvisioningStats,

                atoms.rcsClientProvisioningStats.length);

        log.rcsAcsProvisioningStats = Arrays.copyOf(atoms.rcsAcsProvisioningStats,

                atoms.rcsAcsProvisioningStats.length);

        log.sipDelegateStats = Arrays.copyOf(atoms.sipDelegateStats, atoms.sipDelegateStats.length);

        log.sipTransportFeatureTagStats = Arrays.copyOf(atoms.sipTransportFeatureTagStats,

                atoms.sipTransportFeatureTagStats.length);

        log.sipMessageResponse = Arrays.copyOf(atoms.sipMessageResponse,

                atoms.sipMessageResponse.length);

        log.sipTransportSession = Arrays.copyOf(atoms.sipTransportSession,

                atoms.sipTransportSession.length);

        log.imsDedicatedBearerListenerEvent = Arrays.copyOf(atoms.imsDedicatedBearerListenerEvent,

                atoms.imsDedicatedBearerListenerEvent.length);

        log.imsDedicatedBearerEvent = Arrays.copyOf(atoms.imsDedicatedBearerEvent,

                atoms.imsDedicatedBearerEvent.length);

        log.imsRegistrationServiceDescStats = Arrays.copyOf(atoms.imsRegistrationServiceDescStats,

                atoms.imsRegistrationServiceDescStats.length);

        log.uceEventStats = Arrays.copyOf(atoms.uceEventStats, atoms.uceEventStats.length);

        log.presenceNotifyEvent = Arrays.copyOf(atoms.presenceNotifyEvent,

                atoms.presenceNotifyEvent.length);

        log.gbaEvent = Arrays.copyOf(atoms.gbaEvent, atoms.gbaEvent.length);



        return log;

    }



}

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

+0 −4
Original line number Diff line number Diff line
@@ -290,14 +290,12 @@ public class TelephonyMetrics { 
                    break;

                case "--metricsproto":

                    pw.println(convertProtoToBase64String(buildProto()));

                    pw.println(RcsStats.getInstance().buildLog());

                    if (reset) {

                        reset();

                    }

                    break;

                case "--metricsprototext":

                    pw.println(buildProto().toString());

                    pw.println(RcsStats.getInstance().buildProto().toString());

                    break;

            }

        }
@@ -749,8 +747,6 @@ public class TelephonyMetrics { 
                    .setRadioState(mLastRadioState.get(key)).build();

            addTelephonyEvent(event);

        }



        RcsStats.getInstance().reset();

    }



    /**