joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests 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
commit 6cab3df7dc
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
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);