diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-03-31 14:08:23 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2017-04-02 22:29:07 -0600 |
| commit | fe9a53bc45fd0124a876dc0a49680aaf86641d3e (patch) | |
| tree | 56d1ea4b6f0fe98fa628a72f197cefa0fbabcb22 /services/midi/java | |
| parent | 21a5edcc24cbca1ae3f0855d71737b22ab81ad6d (diff) | |
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
Diffstat (limited to 'services/midi/java')
| -rw-r--r-- | services/midi/java/com/android/server/midi/MidiService.java | 3 |
1 files changed, 2 insertions, 1 deletions
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:"); |