Merge "Update the permission check for dump"

2021-04-19 05:37:09 +00:00
parent dfb51531e6 70348a2672
commit 8df8f29f8b
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/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);