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

Commit 532c9c45 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Protect more service dump() methods." into jb-mr1-dev

parents a30d9694 52801aae

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -283,6 +283,8 @@ public class SearchManagerService extends ISearchManager.Stub { 




    @Override

    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);



        IndentingPrintWriter ipw = new IndentingPrintWriter(pw, "  ");

        IndentingPrintWriter ipw = new IndentingPrintWriter(pw, "  ");

        synchronized (mSearchables) {

        synchronized (mSearchables) {

            for (int i = 0; i < mSearchables.size(); i++) {

            for (int i = 0; i < mSearchables.size(); i++) {

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -304,6 +304,8 @@ class AppWidgetService extends IAppWidgetService.Stub 




    @Override

    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    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

        // Dump the state of all the app widget providers

        synchronized (mAppWidgetServices) {

        synchronized (mAppWidgetServices) {

            IndentingPrintWriter ipw = new IndentingPrintWriter(pw, "  ");

            IndentingPrintWriter ipw = new IndentingPrintWriter(pw, "  ");