commit 6cab3df7dc5fc47c8bc5d35825957781c86e50ee
author Chiachang Wang <chiachangwang@google.com> Mon Apr 19 05:37:09 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 19 05:37:09 2021 +0000
tree 2fbc538242b93ebdd69dba3420862c755498c400
parent 24ff1cea47cf1905a7cd08266aa93ed15b70e9bc
parent a101f85b13c95142adda79c52ac6e16c4a52bdc3

Merge "Update the permission check for dump"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index a39f8f6..2216e89 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2791,6 +2791,8 @@
     @Override
     protected void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter writer,
             @Nullable String[] args) {
+        if (!checkDumpPermission(mContext, TAG, writer)) return;
+
         mPriorityDumper.dump(fd, writer, args);
     }
 
@@ -2808,7 +2810,6 @@
 
     private void doDump(FileDescriptor fd, PrintWriter writer, String[] args) {
         final IndentingPrintWriter pw = new IndentingPrintWriter(writer, "  ");
-        if (!checkDumpPermission(mContext, TAG, pw)) return;
 
         if (CollectionUtils.contains(args, DIAG_ARG)) {
             dumpNetworkDiagnostics(pw);