From da5b6f2dc4ba23b6b70209f9b34fb39c93a51fc4 Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Wed, 14 Aug 2013 09:46:52 -0400
Subject: [PATCH] Normalize dream service dump check with other services.

Bug:10310128
Change-Id: Ieeeccc01832b569cf7fb3d1633d7dde60fceb7b2
---
 services/java/com/android/server/dreams/DreamManagerService.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/dreams/DreamManagerService.java b/services/java/com/android/server/dreams/DreamManagerService.java
index 21e54fec863b..b6e778170d17 100644
--- a/services/java/com/android/server/dreams/DreamManagerService.java
+++ b/services/java/com/android/server/dreams/DreamManagerService.java
@@ -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();
-- 
2.11.0