commit a5b7b9cfd8985f14875097743379a02473d13647
author Chiachang Wang <chiachangwang@google.com> Mon Apr 19 06:20:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 19 06:20:15 2021 +0000
tree fde469d5406e7dc06dad208a9ed31b0a36d25bad
parent 8917ed4069858737c395bf400204b016734a4ca1
parent 2f059d6005b3b69ffd5a346fbd16b18169a1117f

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

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

Change-Id: Ie43488b368a8bae1c75b4228f2214dd540a9b8f7

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 16e6671..322a181 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2810,6 +2810,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);
     }
 
@@ -2827,7 +2829,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);