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

Commit 11d646ee authored by Rafael Higuera Silva's avatar Rafael Higuera Silva Committed by Automerger Merge Worker
Browse files

Add fold state to voice call session am: 65debc1e 

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



Change-Id: I43d284345d98765ba327ea286f4ae1561079bda5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04021dc6 65debc1e

proto/src/persist_atoms.proto

+1 −0
Original line number Original line Diff line number Diff line
@@ -274,6 +274,7 @@ message VoiceCallSession { 
    optional bool is_multiparty = 31;

    optional bool is_multiparty = 31;

    optional int32 call_duration = 32;

    optional int32 call_duration = 32;

    optional int32 last_known_rat = 33;

    optional int32 last_known_rat = 33;

    optional int32 fold_state = 34;





    // Internal use only

    // Internal use only

    optional int64 setup_begin_millis = 10001;

    optional int64 setup_begin_millis = 10001;

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -974,7 +974,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
                session.ratAtConnected,

                session.ratAtConnected,

                session.isMultiparty,

                session.isMultiparty,

                session.callDuration,

                session.callDuration,

                session.lastKnownRat);

                session.lastKnownRat,

                session.foldState);

    }

    }





    private static StatsEvent buildStatsEvent(IncomingSms sms) {

    private static StatsEvent buildStatsEvent(IncomingSms sms) {

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -157,6 +157,8 @@ public class VoiceCallSessionStats { 
    private final PersistAtomsStorage mAtomsStorage =

    private final PersistAtomsStorage mAtomsStorage =

            PhoneFactory.getMetricsCollector().getAtomsStorage();

            PhoneFactory.getMetricsCollector().getAtomsStorage();

    private final UiccController mUiccController = UiccController.getInstance();

    private final UiccController mUiccController = UiccController.getInstance();

    private final DeviceStateHelper mDeviceStateHelper =

            PhoneFactory.getMetricsCollector().getDeviceStateHelper();





    public VoiceCallSessionStats(int phoneId, Phone phone) {

    public VoiceCallSessionStats(int phoneId, Phone phone) {

        mPhoneId = phoneId;

        mPhoneId = phoneId;
@@ -514,6 +516,9 @@ public class VoiceCallSessionStats { 
        // Update end RAT

        // Update end RAT

        updateRatAtEnd(proto, getVoiceRatWithVoNRFix(mPhone, getServiceState(), proto.bearerAtEnd));

        updateRatAtEnd(proto, getVoiceRatWithVoNRFix(mPhone, getServiceState(), proto.bearerAtEnd));





        // Set device fold state

        proto.foldState = mDeviceStateHelper.getFoldState();



        mAtomsStorage.addVoiceCallSession(proto);

        mAtomsStorage.addVoiceCallSession(proto);





        // merge RAT usages to PersistPullers when the call session ends (i.e. no more active calls)

        // merge RAT usages to PersistPullers when the call session ends (i.e. no more active calls)