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

Commit 3d709a94 authored by Achim Thesmann's avatar Achim Thesmann Committed by Android (Google) Code Review
Browse files

Merge "Fix opt-in handling of new constants" into main

parents 652fede8 0bd5b4ed

services/core/java/com/android/server/wm/BackgroundActivityStartController.java

+6 −2
Original line number Diff line number Diff line
@@ -516,7 +516,9 @@ public class BackgroundActivityStartController { 
                return !callerExplicitOptOut();

            }

            return mCheckedOptions.getPendingIntentCreatorBackgroundActivityStartMode()

                    == MODE_BACKGROUND_ACTIVITY_START_ALLOWED;

                    != MODE_BACKGROUND_ACTIVITY_START_DENIED

                    && mCheckedOptions.getPendingIntentCreatorBackgroundActivityStartMode()

                    != MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED;

        }



        public boolean realCallerExplicitOptInOrAutoOptIn() {
@@ -524,7 +526,9 @@ public class BackgroundActivityStartController { 
                return !realCallerExplicitOptOut();

            }

            return mCheckedOptions.getPendingIntentBackgroundActivityStartMode()

                    == MODE_BACKGROUND_ACTIVITY_START_ALLOWED;

                    != MODE_BACKGROUND_ACTIVITY_START_DENIED

                    && mCheckedOptions.getPendingIntentBackgroundActivityStartMode()

                    != MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED;

        }



        public boolean callerExplicitOptOut() {