From 0e5da8c50681e4cc8693d885c5f4e89f3b039f07 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 13 Apr 2016 16:23:28 -0700 Subject: [PATCH] Fix issue #28156248: Receiving connectivity receiver... ...broadcasts in Android N Ooops. Change-Id: I91ae6d3993e5e295965d8825e07993e67d10b357 --- .../core/java/com/android/server/am/ActivityManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 4c75f50804fe7..04a63a138014b 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -17622,7 +17622,7 @@ public final class ActivityManagerService extends ActivityManagerNative int res = broadcastIntentLocked(callerApp, callerApp != null ? callerApp.info.packageName : null, intent, resolvedType, resultTo, resultCode, resultData, resultExtras, - requiredPermissions, appOp, null, serialized, sticky, + requiredPermissions, appOp, bOptions, serialized, sticky, callingPid, callingUid, userId); Binder.restoreCallingIdentity(origId); return res;