diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-15 14:01:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-15 14:01:57 -0700 |
| commit | 532c9c4543135463ee1f39b282d3156a3e226d50 (patch) | |
| tree | 7e9746f3384b46ee134523b61d473c9bc1194d3d | |
| parent | a30d969401a8533a5a341664421ba9b1e150bac3 (diff) | |
| parent | 52801aae89196b7ad16ef21b07d2d621e7d0bb61 (diff) | |
| download | frameworks_base-532c9c4543135463ee1f39b282d3156a3e226d50.zip frameworks_base-532c9c4543135463ee1f39b282d3156a3e226d50.tar.gz frameworks_base-532c9c4543135463ee1f39b282d3156a3e226d50.tar.bz2 | |
Merge "Protect more service dump() methods." into jb-mr1-dev
| -rw-r--r-- | core/java/android/server/search/SearchManagerService.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/AppWidgetService.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/server/search/SearchManagerService.java b/core/java/android/server/search/SearchManagerService.java index de4dd88..affeb90 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 c18fe0e..e7e4f87 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, " "); |