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

Commit 38a0bcf6 authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Merge "Notify battery stats on ST wakeup" into udc-dev am: 515c4381 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21610686



Change-Id: I26adb2d4f2432e21f8c53fbbbe99eae4cdcf525e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99aaf8a5 515c4381

services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareLogging.java

+13 −0
Original line number Diff line number Diff line
@@ -30,11 +30,14 @@ import android.media.soundtrigger.SoundModel; 
import android.media.soundtrigger_middleware.ISoundTriggerCallback;

import android.media.soundtrigger_middleware.ISoundTriggerModule;

import android.media.soundtrigger_middleware.SoundTriggerModuleDescriptor;

import android.os.BatteryStatsInternal;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.SystemClock;

import android.util.Log;



import com.android.internal.util.LatencyTracker;

import com.android.server.LocalServices;



import java.io.PrintWriter;

import java.text.SimpleDateFormat;
@@ -291,6 +294,8 @@ public class SoundTriggerMiddlewareLogging implements ISoundTriggerMiddlewareInt 
            public void onRecognition(int modelHandle, RecognitionEvent event, int captureSession)

                    throws RemoteException {

                try {

                    BatteryStatsHolder.INSTANCE.noteWakingSoundTrigger(

                            SystemClock.elapsedRealtime(), mOriginatorIdentity.uid);

                    mCallbackDelegate.onRecognition(modelHandle, event, captureSession);

                    logVoidReturn("onRecognition", modelHandle, event);

                } catch (Exception e) {
@@ -304,6 +309,8 @@ public class SoundTriggerMiddlewareLogging implements ISoundTriggerMiddlewareInt 
                    int captureSession)

                    throws RemoteException {

                try {

                    BatteryStatsHolder.INSTANCE.noteWakingSoundTrigger(

                            SystemClock.elapsedRealtime(), mOriginatorIdentity.uid);

                    startKeyphraseEventLatencyTracking(event);

                    mCallbackDelegate.onPhraseRecognition(modelHandle, event, captureSession);

                    logVoidReturn("onPhraseRecognition", modelHandle, event);
@@ -387,6 +394,12 @@ public class SoundTriggerMiddlewareLogging implements ISoundTriggerMiddlewareInt 
        }

    }



    private static class BatteryStatsHolder {

        private static final BatteryStatsInternal INSTANCE =

                LocalServices.getService(BatteryStatsInternal.class);

    }





    ////////////////////////////////////////////////////////////////////////////////////////////////

    // Actual logging logic below.

    private static final int NUM_EVENTS_TO_DUMP = 64;