From fe9a53bc45fd0124a876dc0a49680aaf86641d3e Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 31 Mar 2017 14:08:23 -0600 Subject: Consistent dump() permission checking. This change introduces new methods on DumpUtils that can check if the caller has DUMP and/or PACKAGE_USAGE_STATS access. It then moves all existing dump() methods to use these checks so that we emit consistent error messages. Test: cts-tradefed run commandAndExit cts-dev -m CtsSecurityTestCases -t android.security.cts.ServicePermissionsTest Bug: 32806790 Change-Id: Iaff6b9506818ee082b1e169c89ebe1001b3bfeca --- services/midi/java/com/android/server/midi/MidiService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'services/midi/java') diff --git a/services/midi/java/com/android/server/midi/MidiService.java b/services/midi/java/com/android/server/midi/MidiService.java index 1c18c9b091b7..100e4594b2e7 100644 --- a/services/midi/java/com/android/server/midi/MidiService.java +++ b/services/midi/java/com/android/server/midi/MidiService.java @@ -45,6 +45,7 @@ import android.os.UserHandle; import android.util.Log; import com.android.internal.content.PackageMonitor; +import com.android.internal.util.DumpUtils; import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.XmlUtils; import com.android.server.SystemService; @@ -1011,7 +1012,7 @@ public class MidiService extends IMidiManager.Stub { @Override public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { - mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG); + if (!DumpUtils.checkDumpPermission(mContext, TAG, writer)) return; final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); pw.println("MIDI Manager State:"); -- cgit v1.2.3-59-g8ed1b