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

Commit 0fd6b40d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Log code only in BAL log" into main

parents 43e4dede 06b6fb57

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

+8 −2
Original line number Diff line number Diff line
@@ -578,7 +578,10 @@ public class BackgroundActivityStartController { 
            sb.append("; balAllowedByPiCreator: ").append(mBalAllowedByPiCreator);

            sb.append("; balAllowedByPiCreatorWithHardening: ")

                    .append(mBalAllowedByPiCreatorWithHardening);

            sb.append("; resultIfPiCreatorAllowsBal: ").append(mResultForCaller);

            if (mResultForCaller != null) {

                sb.append("; resultIfPiCreatorAllowsBal: ")

                        .append(balCodeToString(mResultForCaller.mCode));

            }

            sb.append("; callerStartMode: ").append(balStartModeToString(

                    mCheckedOptions.getPendingIntentCreatorBackgroundActivityStartMode()));

            sb.append("; hasRealCaller: ").append(hasRealCaller());
@@ -607,7 +610,10 @@ public class BackgroundActivityStartController { 
                            .append(mRealCallerApp.hasActivityInVisibleTask());

                }

                sb.append("; balAllowedByPiSender: ").append(mBalAllowedByPiSender);

                sb.append("; resultIfPiSenderAllowsBal: ").append(mResultForRealCaller);

                if (mResultForRealCaller != null) {

                    sb.append("; resultIfPiSenderAllowsBal: ")

                            .append(balCodeToString(mResultForRealCaller.mCode));

                }

                sb.append("; realCallerStartMode: ").append(balStartModeToString(

                        mCheckedOptions.getPendingIntentBackgroundActivityStartMode()));

            }

services/tests/wmtests/src/com/android/server/wm/BackgroundActivityStartControllerTests.java

+0 −4
Original line number Diff line number Diff line
@@ -572,7 +572,6 @@ public class BackgroundActivityStartControllerTests { 
                        + "inVisibleTask: false; "

                        + "balAllowedByPiCreator: BSP.ALLOW_BAL; "

                        + "balAllowedByPiCreatorWithHardening: BSP.ALLOW_BAL; "

                        + "resultIfPiCreatorAllowsBal: null; "

                        + "callerStartMode: MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED; "

                        + "hasRealCaller: true; "

                        + "isCallForResult: false; "
@@ -589,7 +588,6 @@ public class BackgroundActivityStartControllerTests { 
                        + "originatingPendingIntent: null; "

                        + "realCallerApp: null; "

                        + "balAllowedByPiSender: BSP.ALLOW_BAL; "

                        + "resultIfPiSenderAllowsBal: null; "

                        + "realCallerStartMode: MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED; "

                        + "balRequireOptInByPendingIntentCreator: true; "

                        + "balDontBringExistingBackgroundTaskStackToFg: true]");
@@ -677,7 +675,6 @@ public class BackgroundActivityStartControllerTests { 
                        + "inVisibleTask: false; "

                        + "balAllowedByPiCreator: BSP.NONE; "

                        + "balAllowedByPiCreatorWithHardening: BSP.NONE; "

                        + "resultIfPiCreatorAllowsBal: null; "

                        + "callerStartMode: MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED; "

                        + "hasRealCaller: true; "

                        + "isCallForResult: false; "
@@ -694,7 +691,6 @@ public class BackgroundActivityStartControllerTests { 
                        + "originatingPendingIntent: PendingIntentRecord; "

                        + "realCallerApp: null; "

                        + "balAllowedByPiSender: BSP.ALLOW_FGS; "

                        + "resultIfPiSenderAllowsBal: null; "

                        + "realCallerStartMode: MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED; "

                        + "balRequireOptInByPendingIntentCreator: true; "

                        + "balDontBringExistingBackgroundTaskStackToFg: true]");