Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec8d1280 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev 

* commit '532c9c45':
  Protect more service dump() methods.
parents 4e579b5a 532c9c45

core/java/android/server/search/SearchManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -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++) {

services/java/com/android/server/AppWidgetService.java

+2 −0
Original line number Diff line number Diff line
@@ -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, "  ");