From a13630cfd7bc1d4d8cfac33512b01d24f9f2e1dd Mon Sep 17 00:00:00 2001
From: Eugene Susla <eugenesusla@google.com>
Date: Wed, 16 Sep 2020 12:07:39 -0700
Subject: [PATCH] Add permission check to CDM dump

Test: atest CompanionDeviceManagerTest
Change-Id: I00fee1d58c96e10661d6f3095f88e889d4e94d63
---
 .../server/companion/CompanionDeviceManagerService.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index c9e5d011f9f5a..6ca99d1a244b6 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -83,6 +83,7 @@ import com.android.internal.notification.NotificationAccessConfirmationActivityC
 import com.android.internal.os.BackgroundThread;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.CollectionUtils;
+import com.android.internal.util.DumpUtils;
 import com.android.internal.util.function.pooled.PooledLambda;
 import com.android.server.FgThread;
 import com.android.server.LocalServices;
@@ -484,6 +485,10 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
         public void dump(@NonNull FileDescriptor fd,
                 @NonNull PrintWriter fout,
                 @Nullable String[] args) {
+            if (!DumpUtils.checkDumpAndUsageStatsPermission(getContext(), LOG_TAG, fout)) {
+                return;
+            }
+
             fout.append("Companion Device Associations:").append('\n');
             synchronized (mLock) {
                 forEach(mCachedAssociations, a -> {