Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add permission check to CDM dump

Browse Source 
Test: atest CompanionDeviceManagerTest
Change-Id: I00fee1d58c96e10661d6f3095f88e889d4e94d63
This commit is contained in:
Eugene Susla
2020-09-16 12:07:39 -07:00
parent aed0840da5
commit a13630cfd7
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -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 -> {