Merge "Update the permission check for dump" (32032cbf) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);