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

Commit 45378095 authored by Michael Groover's avatar Michael Groover Committed by Android (Google) Code Review
Browse files

Merge "Add required flag to registerReceiver call in RemoteBugreportManager"

parents db866e75 f1df5845

services/devicepolicy/java/com/android/server/devicepolicy/RemoteBugreportManager.java

+2 −1
Original line number Diff line number Diff line
@@ -219,7 +219,8 @@ public class RemoteBugreportManager { 
        try {

            final IntentFilter filterFinished =

                    new IntentFilter(ACTION_REMOTE_BUGREPORT_DISPATCH, BUGREPORT_MIMETYPE);

            mContext.registerReceiver(mRemoteBugreportFinishedReceiver, filterFinished);

            mContext.registerReceiver(mRemoteBugreportFinishedReceiver, filterFinished,

                    Context.RECEIVER_EXPORTED);

        } catch (IntentFilter.MalformedMimeTypeException e) {

            // should never happen, as setting a constant

            Slogf.w(LOG_TAG, e, "Failed to set type %s", BUGREPORT_MIMETYPE);

services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java

+6 −0
Original line number Diff line number Diff line
@@ -438,6 +438,12 @@ public class DpmMockContext extends MockContext { 
        return spiedContext.registerReceiver(receiver, filter);

    }



    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter, int flags) {

        mMockSystemServices.registerReceiver(receiver, filter, null);

        return spiedContext.registerReceiver(receiver, filter, flags);

    }



    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            String broadcastPermission, Handler scheduler) {