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

Commit e2503c72 authored by Achim Thesmann's avatar Achim Thesmann
Browse files

RESTRICT AUTOMERGE Ignore pinned Windows 

Pinned windows (e.g. PIP windows) should not enable BAL.

Test: atest BackgroundActivityLaunchTest
Flag: EXEMPT security fix
Bug: 406880479
Change-Id: I7ef4eb7123de24815703f4cc36cd192b6bca9517
parent 3c4532fb

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

+6 −2
Original line number Diff line number Diff line
@@ -197,7 +197,9 @@ public class BackgroundActivityStartController { 


        // don't abort if the callingUid has a visible window or is a persistent system process

        final int callingUidProcState = mService.mActiveUids.getUidState(callingUid);

        final boolean callingUidHasAnyVisibleWindow = mService.hasActiveVisibleWindow(callingUid);

        final boolean callingUidHasAnyVisibleWindow =

                mService.mVisibleActivityProcessTracker.hasVisibleNotPinnedActivity(callingUid)

                        || mService.mActiveUids.hasNonAppVisibleWindow(callingUid);

        final boolean isCallingUidForeground =

                callingUidHasAnyVisibleWindow

                        || callingUidProcState == ActivityManager.PROCESS_STATE_TOP
@@ -229,7 +231,9 @@ public class BackgroundActivityStartController { 
        final boolean realCallingUidHasAnyVisibleWindow =

                (callingUid == realCallingUid)

                        ? callingUidHasAnyVisibleWindow

                        : mService.hasActiveVisibleWindow(realCallingUid);

                        : (mService.mVisibleActivityProcessTracker.hasVisibleNotPinnedActivity(

                                realCallingUid) || mService.mActiveUids.hasNonAppVisibleWindow(

                                realCallingUid));

        final boolean isRealCallingUidForeground =

                (callingUid == realCallingUid)

                        ? isCallingUidForeground

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

+4 −2
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ class BackgroundLaunchProcessController { 
    @BackgroundActivityStartController.BalCode

    int areBackgroundActivityStartsAllowed(int pid, int uid, String packageName,

            int appSwitchState, boolean isCheckingForFgsStart,

            boolean hasActivityInVisibleTask, boolean hasBackgroundActivityStartPrivileges,

            boolean hasActivityInVisibleTask, boolean inPinnedWindow,

            boolean hasBackgroundActivityStartPrivileges,

            long lastStopAppSwitchesTime, long lastActivityLaunchTime,

            long lastActivityFinishTime) {

        // If app switching is not allowed, we ignore all the start activity grace period
@@ -116,7 +117,8 @@ class BackgroundLaunchProcessController { 
                        + "activity starts privileges");

        }

        // Allow if the caller has an activity in any foreground task.

        if (hasActivityInVisibleTask

        if ((isCheckingForFgsStart || !inPinnedWindow)

                && hasActivityInVisibleTask

                && (appSwitchState == APP_SWITCH_ALLOW || appSwitchState == APP_SWITCH_FG_ONLY)) {

            return BackgroundActivityStartController.logStartAllowedAndReturnCode(

                    BAL_ALLOW_FOREGROUND, /*background*/ false, uid, uid, /*intent*/ null,

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

+11 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import java.util.function.Predicate; 
 * host process with foreground (resumed) activity.

 */

class VisibleActivityProcessTracker {

    private static final Predicate<WindowProcessController> ALWAYS_TRUE = wpc -> true;

    @GuardedBy("mProcMap")

    private final ArrayMap<WindowProcessController, CpuTimeRecord> mProcMap = new ArrayMap<>();

    final Executor mBgExecutor = BackgroundThread.getExecutor();
@@ -80,14 +81,22 @@ class VisibleActivityProcessTracker { 
     * {@link ActivityRecord#mVisibleRequested} or {@link ActivityRecord#isVisible()} is true.

     */

    boolean hasVisibleActivity(int uid) {

        return match(uid, null /* predicate */);

        return match(uid, ALWAYS_TRUE);

    }



    /**

     * Returns {@code true} if the uid has a process that contains an activity with

     * {@link ActivityRecord#mVisibleRequested} or {@link ActivityRecord#isVisible()} is true.

     */

    boolean hasVisibleNotPinnedActivity(int uid) {

        return match(uid, wpc -> !wpc.inPinnedWindowingMode());

    }



    private boolean match(int uid, Predicate<WindowProcessController> predicate) {

        synchronized (mProcMap) {

            for (int i = mProcMap.size() - 1; i >= 0; i--) {

                final WindowProcessController wpc = mProcMap.keyAt(i);

                if (wpc.mUid == uid && (predicate == null || predicate.test(wpc))) {

                if (wpc.mUid == uid && predicate.test(wpc)) {

                    return true;

                }

            }

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

+1 −0
Original line number Diff line number Diff line
@@ -559,6 +559,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
            boolean isCheckingForFgsStart) {

        return mBgLaunchController.areBackgroundActivityStartsAllowed(mPid, mUid, mInfo.packageName,

                appSwitchState, isCheckingForFgsStart, hasActivityInVisibleTask(),

                inPinnedWindowingMode(),

                mInstrumentingWithBackgroundActivityStartPrivileges,

                mAtm.getLastStopAppSwitchesTime(),

                mLastActivityLaunchTime, mLastActivityFinishTime);

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

0 → 100644
+95 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.mock;



import android.app.IApplicationThread;

import android.app.WindowConfiguration;

import android.content.pm.ApplicationInfo;

import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;





/**

 * Tests for the {@link com.android.server.wm.VisibleActivityProcessTracker} class.

 *

 * Build/Install/Run:

 * atest WmTests:VisibleActivityProcessTrackerTests

 */

@SmallTest

@Presubmit

@RunWith(WindowTestRunner.class)

public class VisibleActivityProcessTrackerTests extends WindowTestsBase {



    private VisibleActivityProcessTracker mTracker;



    @Before

    public void setup() {

        mTracker = mAtm.mVisibleActivityProcessTracker;

    }



    @Test

    public void testVisibleActivity() {

        WindowProcessController wpc = createWindowProcessController();

        assertThat(mTracker.hasVisibleActivity(wpc.mUid)).isFalse();

        mTracker.onAnyActivityVisible(wpc);

        assertThat(mTracker.hasVisibleActivity(wpc.mUid)).isTrue();

        mTracker.onAllActivitiesInvisible(wpc);

        assertThat(mTracker.hasVisibleActivity(wpc.mUid)).isFalse();

    }



    @Test

    public void testVisibleNotPinnedActivity() {

        WindowProcessController wpc = createWindowProcessController();

        assertThat(mTracker.hasVisibleNotPinnedActivity(wpc.mUid)).isFalse();

        mTracker.onAnyActivityVisible(wpc);

        assertThat(mTracker.hasVisibleNotPinnedActivity(wpc.mUid)).isTrue();

        mTracker.onAllActivitiesInvisible(wpc);

        assertThat(mTracker.hasVisibleNotPinnedActivity(wpc.mUid)).isFalse();

    }



    @Test

    public void testVisiblePinnedActivity() {

        WindowProcessController wpc = createWindowProcessController();

        wpc.getConfiguration().windowConfiguration.setWindowingMode(

                WindowConfiguration.WINDOWING_MODE_PINNED);

        assertThat(mTracker.hasVisibleNotPinnedActivity(wpc.mUid)).isFalse();

        mTracker.onAnyActivityVisible(wpc);

        assertThat(mTracker.hasVisibleActivity(wpc.mUid)).isTrue();

        assertThat(mTracker.hasVisibleNotPinnedActivity(wpc.mUid)).isFalse();

        mTracker.onAllActivitiesInvisible(wpc);

        assertThat(mTracker.hasVisibleNotPinnedActivity(wpc.mUid)).isFalse();

    }



    WindowProcessController createWindowProcessController() {

        WindowProcessListener mMockListener = mock(WindowProcessListener.class);

        ApplicationInfo info = mock(ApplicationInfo.class);

        info.packageName = "test.package.name";

        WindowProcessController mWpc = new WindowProcessController(

                mAtm, info, null, 0, -1, null, mMockListener);

        mWpc.setThread(mock(IApplicationThread.class));

        return mWpc;

    }

}