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

Commit c02364cf authored by Michal Karpinski's avatar Michal Karpinski
Browse files

Show a toast for background activity starts but only abort the start 

if the feature is enabled (it's disabled by default)

The idea is to provide feedback for dogfooders and 1P app devs to
file bugs for us to investigate.

Former behaviour:
feature off (default) - do nothing, exit early
feature on - log to logcat and TRON, show the toast, and abort start

New bahaviour (temporary permissive mode):
feature off (default) - log to logcat and TRON, show the toast, and
                        allow start anyway
feature on - log to logcat and TRON, show the toast, and abort start

Bug: 110956953
Test: atest WmTests:ActivityStarterTests
Test: manual, both on and off
Change-Id: If11447c709deba1f25616e2bf8c14175d55cb1d5
parent 25b54058

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

+24 −19
Original line number Diff line number Diff line
@@ -747,12 +747,23 @@ class ActivityStarter { 
        abort |= !mService.mIntentFirewall.checkStartActivity(intent, callingUid,

                callingPid, resolvedType, aInfo.applicationInfo);



        // not sure if we need to create START_ABORTED_BACKGROUND so for now piggybacking

        // on START_ABORTED

        boolean abortBackgroundStart = false;

        if (!abort) {

            abort |= shouldAbortBackgroundActivityStart(callingUid, callingPid, callingPackage,

                    realCallingUid, callerApp, originatingPendingIntent,

            abortBackgroundStart = shouldAbortBackgroundActivityStart(callingUid, callingPid,

                    callingPackage, realCallingUid, callerApp, originatingPendingIntent,

                    allowBackgroundActivityStart, intent);

            abort |= (abortBackgroundStart && !mService.isBackgroundActivityStartsEnabled());

            // TODO: remove this toast after feature development is done

            if (abortBackgroundStart) {

                final String toastMsg = abort

                        ? "Background activity start from " + callingPackage

                                + " blocked. See go/q-bg-block."

                        : "This background activity start from " + callingPackage

                                + " will be blocked in future Q builds. See go/q-bg-block.";

                mService.mUiHandler.post(() -> {

                    Toast.makeText(mService.mContext, toastMsg, Toast.LENGTH_LONG).show();

                });

            }

        }



        // Merge the two options bundles, while realCallerOptions takes precedence.
@@ -798,8 +809,6 @@ class ActivityStarter { 
            // We pretend to the caller that it was really started, but

            // they will just get a cancel result.

            ActivityOptions.abort(checkedOptions);

            maybeLogActivityStart(callingUid, callingPackage, realCallingUid, intent, callerApp,

                    null /*r*/, originatingPendingIntent, true /*abortedStart*/);

            return START_ABORTED;

        }
@@ -892,8 +901,11 @@ class ActivityStarter { 
        mService.onStartActivitySetDidAppSwitch();

        mController.doPendingActivityLaunches(false);



        // maybe log to TRON, but only if we haven't already in shouldAbortBackgroundActivityStart()

        if (!abortBackgroundStart) {

            maybeLogActivityStart(callingUid, callingPackage, realCallingUid, intent, callerApp, r,

                    originatingPendingIntent, false /*abortedStart*/);

        }



        return startActivity(r, sourceRecord, voiceSession, voiceInteractor, startFlags,

                true /* doResume */, checkedOptions, inTask, outActivity);
@@ -903,9 +915,6 @@ class ActivityStarter { 
            final String callingPackage, int realCallingUid, WindowProcessController callerApp,

            PendingIntentRecord originatingPendingIntent, boolean allowBackgroundActivityStart,

            Intent intent) {

        if (mService.isBackgroundActivityStartsEnabled()) {

            return false;

        }

        // don't abort for the most important UIDs

        if (callingUid == Process.ROOT_UID || callingUid == Process.SYSTEM_UID) {

            return false;
@@ -949,8 +958,8 @@ class ActivityStarter { 
        if (mSupervisor.mRecentTasks.isCallerRecents(callingUid)) {

            return false;

        }

        // anything that has fallen through will currently be aborted

        Slog.w(TAG, "Blocking background activity start [callingPackage: " + callingPackage

        // anything that has fallen through would currently be aborted

        Slog.w(TAG, "Background activity start [callingPackage: " + callingPackage

                + "; callingUid: " + callingUid

                + "; isCallingUidForeground: " + isCallingUidForeground

                + "; isCallingUidPersistentSystemProcess: " + isCallingUidPersistentSystemProcess
@@ -962,12 +971,8 @@ class ActivityStarter { 
                + "; isBgStartWhitelisted: " + allowBackgroundActivityStart

                + "; intent: " + intent

                + "]");

        // TODO: remove this toast after feature development is done

        mService.mUiHandler.post(() -> {

            Toast.makeText(mService.mContext,

                    "Blocking background activity start for " + callingPackage,

                    Toast.LENGTH_SHORT).show();

        });

        maybeLogActivityStart(callingUid, callingPackage, realCallingUid, intent, callerApp,

                null /*r*/, originatingPendingIntent, true /*abortedStart*/);

        return true;

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -549,8 +549,7 @@ public class ActivityStarterTests extends ActivityTestsBase { 
        verify(mActivityMetricsLogger, times(1)).logActivityStart(any(), any(), any(),

                eq(FAKE_CALLING_UID), eq(FAKE_CALLING_PACKAGE), anyInt(), anyBoolean(),

                eq(FAKE_REAL_CALLING_UID), anyInt(), anyBoolean(), anyInt(),

                eq(ActivityBuilder.getDefaultComponent().getPackageName()), anyInt(), anyBoolean(),

                any(), eq(false));

                any(), anyInt(), anyBoolean(), any(), eq(false));

    }



    /**