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

Merge "Update the permission check for dump"

Browse Source
This commit is contained in:
Chiachang Wang
2021-04-19 05:37:09 +00:00
committed by Gerrit Code Review
parent 68090c1373 d0365eb2d7
commit 32032cbfe3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2791,6 +2791,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
@Override @Override
protected void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter writer, protected void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter writer,
@Nullable String[] args) { @Nullable String[] args) {
if (!checkDumpPermission(mContext, TAG, writer)) return;
mPriorityDumper.dump(fd, writer, args); mPriorityDumper.dump(fd, writer, args);
} }
@@ -2808,7 +2810,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void doDump(FileDescriptor fd, PrintWriter writer, String[] args) { private void doDump(FileDescriptor fd, PrintWriter writer, String[] args) {
final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
if (!checkDumpPermission(mContext, TAG, pw)) return;
if (CollectionUtils.contains(args, DIAG_ARG)) { if (CollectionUtils.contains(args, DIAG_ARG)) {
dumpNetworkDiagnostics(pw); dumpNetworkDiagnostics(pw);