OSDN Git Service

Normalize dream service dump check with other services.
authorJohn Spurlock <jspurlock@google.com>
Wed, 14 Aug 2013 13:46:52 +0000 (09:46 -0400)
committerJohn Spurlock <jspurlock@google.com>
Wed, 14 Aug 2013 13:49:02 +0000 (09:49 -0400)
Bug:10310128
Change-Id: Ieeeccc01832b569cf7fb3d1633d7dde60fceb7b2

services/java/com/android/server/dreams/DreamManagerService.java

index 21e54fe..b6e7781 100644 (file)
@@ -86,7 +86,13 @@ public final class DreamManagerService extends IDreamManager.Stub {
 
     @Override
     protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
-        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);
+        if (mContext.checkCallingOrSelfPermission("android.permission.DUMP")
+                != PackageManager.PERMISSION_GRANTED) {
+            pw.println("Permission Denial: can't dump DreamManager from pid="
+                    + Binder.getCallingPid()
+                    + ", uid=" + Binder.getCallingUid());
+            return;
+        }
 
         pw.println("DREAM MANAGER (dumpsys dreams)");
         pw.println();