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

Commit 6418e974 authored by Govinda Wasserman's avatar Govinda Wasserman
Browse files

Refactors logging into its own function

This will allow logging behavior to be overridden.

Test: Tested locally
BUG:128982146
Change-Id: Iaabc4ad0b44147732e05b4b9317e49bcee91683d
parent 47350b01
Loading
Loading
Loading
Loading
+9 −6
Original line number Diff line number Diff line
@@ -259,11 +259,7 @@ public class AssistManager implements ConfigurationChangedReceiver {
        int phoneState = mPhoneStateMonitor.getPhoneState();
        args.putInt(INVOCATION_PHONE_STATE_KEY, phoneState);
        args.putLong(INVOCATION_TIME_MS_KEY, SystemClock.uptimeMillis());
        // Logs assistant start with invocation type.
        MetricsLogger.action(
                new LogMaker(MetricsEvent.ASSISTANT)
                        .setType(MetricsEvent.TYPE_OPEN)
                        .setSubtype(toLoggingSubType(invocationType, phoneState)));
        logStartAssist(invocationType, phoneState);
        startAssistInternal(args, assistComponent, isService);
    }

@@ -449,7 +445,14 @@ public class AssistManager implements ConfigurationChangedReceiver {
        return toLoggingSubType(invocationType, mPhoneStateMonitor.getPhoneState());
    }

    private int toLoggingSubType(int invocationType, int phoneState) {
    protected void logStartAssist(int invocationType, int phoneState) {
        MetricsLogger.action(
                new LogMaker(MetricsEvent.ASSISTANT)
                        .setType(MetricsEvent.TYPE_OPEN)
                        .setSubtype(toLoggingSubType(invocationType, phoneState)));
    }

    protected final int toLoggingSubType(int invocationType, int phoneState) {
        // Note that this logic will break if the number of Assistant invocation types exceeds 7.
        // There are currently 5 invocation types, but we will be migrating to the new logging
        // framework in the next update.