From 99473f64899861fd56f2a237c3a369b303c6781c Mon Sep 17 00:00:00 2001 From: lucaslin Date: Thu, 10 Dec 2020 15:10:54 +0800 Subject: [PATCH] Reimplement DumpUtils#checkDumpPermission() in ConnectivityService ConnectivityService is going to be a part of mainline module, to prevent using @hide method in ConnectivityService, reimplement DumpUtils#checkDumpPermission() in ConnectivityService. Bug: 175177794 Test: atest FrameworksNetTests Test: adb shell dumpsys connectivity Change-Id: I1e4bc023b39b40a717a3a0fd8cd60aa2f25e9bdb --- .../com/android/server/ConnectivityService.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 9dbdc14235..89c20b03b0 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -186,7 +186,6 @@ import com.android.internal.net.VpnInfo; import com.android.internal.net.VpnProfile; import com.android.internal.util.ArrayUtils; import com.android.internal.util.AsyncChannel; -import com.android.internal.util.DumpUtils; import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.LocationPermissionChecker; import com.android.internal.util.MessageUtils; @@ -2525,9 +2524,21 @@ public class ConnectivityService extends IConnectivityManager.Stub PriorityDump.dump(mPriorityDumper, fd, writer, args); } + private boolean checkDumpPermission(Context context, String tag, PrintWriter pw) { + if (context.checkCallingOrSelfPermission(android.Manifest.permission.DUMP) + != PackageManager.PERMISSION_GRANTED) { + pw.println("Permission Denial: can't dump " + tag + " from from pid=" + + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid() + + " due to missing android.permission.DUMP permission"); + return false; + } else { + return true; + } + } + private void doDump(FileDescriptor fd, PrintWriter writer, String[] args, boolean asProto) { final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); - if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; + if (!checkDumpPermission(mContext, TAG, pw)) return; if (asProto) return; if (ArrayUtils.contains(args, DIAG_ARG)) {