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

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

Merge "Check dump permission in STService" into udc-dev am: 174c28b7 am: 2575a741 

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



Change-Id: Ia3bef852f97ccf6e4ab44b73c0100e3abe7ebae0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa9d75f6 2575a741

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ import android.util.Slog; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.app.ISoundTriggerService;

import com.android.internal.app.ISoundTriggerService;

import com.android.internal.app.ISoundTriggerSession;

import com.android.internal.app.ISoundTriggerSession;

import com.android.internal.util.DumpUtils;

import com.android.server.SoundTriggerInternal;

import com.android.server.SoundTriggerInternal;

import com.android.server.SystemService;

import com.android.server.SystemService;

import com.android.server.soundtrigger.SoundTriggerEvent.ServiceEvent;

import com.android.server.soundtrigger.SoundTriggerEvent.ServiceEvent;
@@ -424,6 +425,7 @@ public class SoundTriggerService extends SystemService { 




        @Override

        @Override

        public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

            if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;

            // Event loggers

            // Event loggers

            pw.println("##Service-Wide logs:");

            pw.println("##Service-Wide logs:");

            mServiceEventLogger.dump(pw, /* indent = */ "  ");

            mServiceEventLogger.dump(pw, /* indent = */ "  ");