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

Commit 271b9186 authored by Eugene Susla's avatar Eugene Susla Committed by Android (Google) Code Review
Browse files

Merge "Add permission check to CDM dump"

parents 97ec56f1 a13630cf

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ import com.android.internal.notification.NotificationAccessConfirmationActivityC 
import com.android.internal.os.BackgroundThread;

import com.android.internal.os.BackgroundThread;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.CollectionUtils;

import com.android.internal.util.CollectionUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.server.FgThread;

import com.android.server.FgThread;

import com.android.server.LocalServices;

import com.android.server.LocalServices;
@@ -484,6 +485,10 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
        public void dump(@NonNull FileDescriptor fd,

        public void dump(@NonNull FileDescriptor fd,

                @NonNull PrintWriter fout,

                @NonNull PrintWriter fout,

                @Nullable String[] args) {

                @Nullable String[] args) {

            if (!DumpUtils.checkDumpAndUsageStatsPermission(getContext(), LOG_TAG, fout)) {

                return;

            }



            fout.append("Companion Device Associations:").append('\n');

            fout.append("Companion Device Associations:").append('\n');

            synchronized (mLock) {

            synchronized (mLock) {

                forEach(mCachedAssociations, a -> {

                forEach(mCachedAssociations, a -> {