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

Commit 9b5f33bc authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Remove receiver flag enforcement workaround for affected package" into... 

Merge "Remove receiver flag enforcement workaround for affected package" into udc-dev am: 71192b44

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22383554



Change-Id: If2ee193bb68b7c7b70ca29642fd0eb1466168564
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 478c5113 71192b44

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −11
Original line number Original line Diff line number Diff line
@@ -13745,17 +13745,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                                + "RECEIVER_NOT_EXPORTED flag");

                                + "RECEIVER_NOT_EXPORTED flag");

            }

            }

















            // STOPSHIP(b/259139792): Allow apps that are currently targeting U and in process of














            // updating their receivers to be exempt from this requirement until their receivers














            // are flagged.














            if (requireExplicitFlagForDynamicReceivers) {














                if ("com.shannon.imsservice".equals(callerPackage)) {














                    // Note, a versionCode check for this package is not performed because this














                    // package consumes the SecurityException, so it wouldn't be caught during














                    // presubmit.














                    requireExplicitFlagForDynamicReceivers = false;














                }














            }














            if (!onlyProtectedBroadcasts) {







            if (!onlyProtectedBroadcasts) {











                if (receiver == null && !explicitExportStateDefined) {







                if (receiver == null && !explicitExportStateDefined) {











                    // sticky broadcast, no flag specified (flag isn't required)







                    // sticky broadcast, no flag specified (flag isn't required)