Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add required flag to registerReceiver call in RemoteBugreportManager"

Browse Source
This commit is contained in:
Michael Groover
2021-11-06 00:06:48 +00:00
committed by Android (Google) Code Review
parent db866e75c0 f1df584560
commit 4537809559
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/devicepolicy/java/com/android/server/devicepolicy/RemoteBugreportManager.java
View File

@@ -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);

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

@@ -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) {