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

Commit a05b0d85 authored by Sahana Rao's avatar Sahana Rao
Browse files

Change isChangeEnabled checks to use variable instead of id 

Changed isChangeEnabled checks to use
DYNAMIC_RECEIVER_EXPLICIT_EXPORT_REQUIRED instead of id.

Bug: 161145287
Test: Manual. Verified that MediaProvider espresso tests are working

Change-Id: Ice221b2f89cdfc27accfb9114b2467be2624c75a
parent 12f914e3

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

+4 −2
Original line number Diff line number Diff line
@@ -12432,7 +12432,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
        // Dynamic receivers are exported by default for versions prior to T

        final boolean exported =

                ((flags & Context.RECEIVER_EXPORTED) != 0

                        || (!Compatibility.isChangeEnabled(161145287)));

                        || (!Compatibility.isChangeEnabled(

                                DYNAMIC_RECEIVER_EXPLICIT_EXPORT_REQUIRED)));















        int callingUid;















        int callingPid;










@@ -12502,7 +12503,8 @@ public class ActivityManagerService extends IActivityManager.Stub



























            // If the change is enabled, but neither exported or not exported is set, we need to log















            // an error so the consumer can know to explicitly set the value for their flag













            if (!onlyProtectedBroadcasts && (Compatibility.isChangeEnabled(161145287)













            if (!onlyProtectedBroadcasts && (Compatibility.isChangeEnabled(













                    DYNAMIC_RECEIVER_EXPLICIT_EXPORT_REQUIRED)















                    && (flags & (Context.RECEIVER_EXPORTED | Context.RECEIVER_NOT_EXPORTED))















                    == 0)) {















                Slog.e(TAG,