Merge "Update the permission check for dump" am: 8df8f29f8b am: 1e46f3f547

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

Change-Id: Id4c40e177621f39174cd4cf6cd39cc40033302b8

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

@@ -2791,6 +2791,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
     @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 @@ public class ConnectivityService extends IConnectivityManager.Stub
 
     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);