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

Commit b22d67e6 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Correcting NULL pointer when callerApp is not set" into cm-10.2

parents afeba31a 9d639245
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -11815,8 +11815,12 @@ public final class ActivityManagerService extends ActivityManagerNative
                        "Receiver requested to register for user " + userId
                        + " was previously registered for user " + rl.userId);
            }
            boolean isSystem = callerApp != null ?
                    (callerApp.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0 : false;
            BroadcastFilter bf = new BroadcastFilter(filter, rl, callerPackage,
                    permission, callingUid, userId, (callerApp.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
                    permission, callingUid, userId, isSystem);
            rl.add(bf);
            if (!bf.debugCheck()) {
                Slog.w(TAG, "==> For Dynamic broadast");