From 52801aae89196b7ad16ef21b07d2d621e7d0bb61 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 12 Oct 2012 16:06:16 -0700 Subject: Protect more service dump() methods. Bug: 6406965 Change-Id: Ia45a580c1e6f403308e7e540f18f2c0505af0f29 --- core/java/android/server/search/SearchManagerService.java | 2 ++ services/java/com/android/server/AppWidgetService.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/java/android/server/search/SearchManagerService.java b/core/java/android/server/search/SearchManagerService.java index de4dd8806ea1..affeb9005018 100644 --- a/core/java/android/server/search/SearchManagerService.java +++ b/core/java/android/server/search/SearchManagerService.java @@ -283,6 +283,8 @@ public class SearchManagerService extends ISearchManager.Stub { @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG); + IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " "); synchronized (mSearchables) { for (int i = 0; i < mSearchables.size(); i++) { diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java index c18fe0e428c4..e7e4f876da1e 100644 --- a/services/java/com/android/server/AppWidgetService.java +++ b/services/java/com/android/server/AppWidgetService.java @@ -304,6 +304,8 @@ class AppWidgetService extends IAppWidgetService.Stub @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG); + // Dump the state of all the app widget providers synchronized (mAppWidgetServices) { IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " "); -- cgit v1.2.3-59-g8ed1b