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

Commit 88cfd3f1 authored by Hui Yu's avatar Hui Yu Committed by Automerger Merge Worker
Browse files

Merge "BG-FGS-Launch restriction also checks for the caller's... 

Merge "BG-FGS-Launch restriction also checks for the caller's targetSdkVersion." into sc-dev am: 564c4dc5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13975049

Change-Id: I937022b4eeeae5953fdd3558d6832916c6f24993
parents 5586cb39 564c4dc5

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

+24 −22
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.am; 


import static android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND;

import static android.Manifest.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND;

import static android.Manifest.permission.SYSTEM_ALERT_WINDOW;

import static android.app.ActivityManager.PROCESS_STATE_HEAVY_WEIGHT;

import static android.app.ActivityManager.PROCESS_STATE_RECEIVER;

import static android.app.ActivityManager.PROCESS_STATE_TOP;
@@ -49,6 +48,7 @@ import static android.os.PowerWhitelistManager.REASON_UID_VISIBLE; 
import static android.os.PowerWhitelistManager.TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED;

import static android.os.PowerWhitelistManager.getReasonCodeFromProcState;

import static android.os.PowerWhitelistManager.reasonCodeToString;

import static android.os.Process.INVALID_UID;

import static android.os.Process.NFC_UID;

import static android.os.Process.ROOT_UID;

import static android.os.Process.SHELL_UID;
@@ -660,7 +660,7 @@ public final class ActiveServices { 
        }



        ServiceRecord r = res.record;

        setFgsRestrictionLocked(callingPackage, callingPid, callingUid, service, r,

        setFgsRestrictionLocked(callingPackage, callingPid, callingUid, service, r, userId,

                allowBackgroundActivityStarts);



        if (!mAm.mUserController.exists(r.userId)) {
@@ -693,19 +693,7 @@ public final class ActiveServices { 
                        + r.shortInstanceName;

                Slog.w(TAG, msg);

                showFgsBgRestrictedNotificationLocked(r);

                ApplicationInfo aInfo = null;

                try {

                    aInfo = AppGlobals.getPackageManager().getApplicationInfo(

                            callingPackage, ActivityManagerService.STOCK_PM_FLAGS,

                            userId);

                } catch (android.os.RemoteException e) {

                    // pm is in same process, this will never happen.

                }

                if (aInfo == null) {

                    throw new SecurityException("startServiceLocked failed, "

                            + "could not resolve client package " + callingPackage);

                }

                if (CompatChanges.isChangeEnabled(FGS_START_EXCEPTION_CHANGE_ID, aInfo.uid)) {

                if (CompatChanges.isChangeEnabled(FGS_START_EXCEPTION_CHANGE_ID, callingUid)) {

                    throw new ForegroundServiceStartNotAllowedException(msg);

                }

                return null;
@@ -1808,7 +1796,7 @@ public final class ActiveServices { 
                            final long delayMs = SystemClock.elapsedRealtime() - r.createRealTime;

                            if (delayMs > mAm.mConstants.mFgsStartForegroundTimeoutMs) {

                                setFgsRestrictionLocked(r.serviceInfo.packageName, r.app.getPid(),

                                        r.appInfo.uid, r.intent.getIntent(), r, false);

                                        r.appInfo.uid, r.intent.getIntent(), r, r.userId,false);

                                final String temp = "startForegroundDelayMs:" + delayMs;

                                if (r.mInfoAllowStartForeground != null) {

                                    r.mInfoAllowStartForeground += "; " + temp;
@@ -1825,7 +1813,7 @@ public final class ActiveServices { 
                                r.mLastSetFgsRestrictionTime;

                        if (delayMs > mAm.mConstants.mFgsStartForegroundTimeoutMs) {

                            setFgsRestrictionLocked(r.serviceInfo.packageName, r.app.getPid(),

                                    r.appInfo.uid, r.intent.getIntent(), r, false);

                                    r.appInfo.uid, r.intent.getIntent(), r, r.userId,false);

                        }

                    }

                    logFgsBackgroundStart(r);
@@ -2579,7 +2567,8 @@ public final class ActiveServices { 
                    return 0;

                }

            }

            setFgsRestrictionLocked(callingPackage, callingPid, callingUid, service, s, false);

            setFgsRestrictionLocked(callingPackage, callingPid, callingUid, service, s, userId,

                    false);



            if (s.app != null) {

                ProcessServiceRecord servicePsr = s.app.mServices;
@@ -5469,7 +5458,7 @@ public final class ActiveServices { 
     * @return true if allow, false otherwise.

     */

    private void setFgsRestrictionLocked(String callingPackage,

            int callingPid, int callingUid, Intent intent, ServiceRecord r,

            int callingPid, int callingUid, Intent intent, ServiceRecord r, int userId,

            boolean allowBackgroundActivityStarts) {

        r.mLastSetFgsRestrictionTime = SystemClock.elapsedRealtime();

        // Check DeviceConfig flag.
@@ -5487,7 +5476,7 @@ public final class ActiveServices { 
            if (r.mAllowStartForeground == REASON_DENIED) {

                r.mAllowStartForeground = shouldAllowFgsStartForegroundLocked(allowWhileInUse,

                        callingPackage, callingPid, callingUid, intent, r,

                        allowBackgroundActivityStarts);

                        userId);

            }

        }

    }
@@ -5630,13 +5619,20 @@ public final class ActiveServices { 
     */

    private @ReasonCode int shouldAllowFgsStartForegroundLocked(

            @ReasonCode int allowWhileInUse, String callingPackage, int callingPid,

            int callingUid, Intent intent, ServiceRecord r, boolean allowBackgroundActivityStarts) {

            int callingUid, Intent intent, ServiceRecord r, int userId) {

        FgsStartTempAllowList.TempFgsAllowListEntry tempAllowListReason =

                r.mInfoTempFgsAllowListReason = mAm.isAllowlistedForFgsStartLOSP(callingUid);

        int ret = shouldAllowFgsStartForegroundLocked(allowWhileInUse, callingPid, callingUid,

                callingPackage, r);



        final int uidState = mAm.getUidStateLocked(callingUid);

        int callerTargetSdkVersion = INVALID_UID;

        try {

            ApplicationInfo ai = mAm.mContext.getPackageManager().getApplicationInfoAsUser(

                    callingPackage, PackageManager.MATCH_KNOWN_PACKAGES, userId);

            callerTargetSdkVersion = ai.targetSdkVersion;

        } catch (PackageManager.NameNotFoundException e) {

        }

        final String debugInfo =

                "[callingPackage: " + callingPackage

                        + "; callingUid: " + callingUid
@@ -5652,6 +5648,7 @@ public final class ActiveServices { 
                                        + ",callingUid:" + tempAllowListReason.mCallingUid))

                        + ">"

                        + "; targetSdkVersion:" + r.appInfo.targetSdkVersion

                        + "; callerTargetSdkVersion:" + callerTargetSdkVersion

                        + "; startForegroundCount:" + r.mStartForegroundCount

                        + "]";

        if (!debugInfo.equals(r.mInfoAllowStartForeground)) {
@@ -5823,7 +5820,12 @@ public final class ActiveServices { 


    private boolean isBgFgsRestrictionEnabled(ServiceRecord r) {

        return mAm.mConstants.mFlagFgsStartRestrictionEnabled

                && CompatChanges.isChangeEnabled(FGS_BG_START_RESTRICTION_CHANGE_ID, r.appInfo.uid);

                // Checking service's targetSdkVersion.

                && CompatChanges.isChangeEnabled(FGS_BG_START_RESTRICTION_CHANGE_ID, r.appInfo.uid)

                && (!mAm.mConstants.mFgsStartRestrictionCheckCallerTargetSdk

                    // Checking callingUid's targetSdkVersion.

                    || CompatChanges.isChangeEnabled(

                            FGS_BG_START_RESTRICTION_CHANGE_ID, r.mRecentCallingUid));

    }



    private void logFgsBackgroundStart(ServiceRecord r) {

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

+32 −0
Original line number Diff line number Diff line
@@ -171,6 +171,13 @@ final class ActivityManagerConstants extends ContentObserver { 
    private static final String KEY_DEFAULT_FGS_STARTS_RESTRICTION_ENABLED =

            "default_fgs_starts_restriction_enabled";



    /**

     * Default value for mFgsStartRestrictionCheckCallerTargetSdk if not explicitly set in

     * Settings.Global.

     */

    private static final String KEY_DEFAULT_FGS_STARTS_RESTRICTION_CHECK_CALLER_TARGET_SDK =

            "default_fgs_starts_restriction_check_caller_target_sdk";



    /**

     * Whether FGS notification display is deferred following the transition into

     * the foreground state.  Default behavior is {@code true} unless overridden.
@@ -371,6 +378,13 @@ final class ActivityManagerConstants extends ContentObserver { 
    // at all.

    volatile boolean mFlagFgsStartRestrictionEnabled = true;



    /**

     * Indicates whether the foreground service background start restriction is enabled for

     * caller app that is targeting S+.

     * This is in addition to check of {@link #mFlagFgsStartRestrictionEnabled} flag.

     */

    volatile boolean mFgsStartRestrictionCheckCallerTargetSdk = true;



    // Whether we defer FGS notifications a few seconds following their transition to

    // the foreground state.  Applies only to S+ apps; enabled by default.

    volatile boolean mFlagFgsNotificationDeferralEnabled = true;
@@ -554,6 +568,9 @@ final class ActivityManagerConstants extends ContentObserver { 
                            case KEY_DEFAULT_FGS_STARTS_RESTRICTION_ENABLED:

                                updateFgsStartsRestriction();

                                break;

                            case KEY_DEFAULT_FGS_STARTS_RESTRICTION_CHECK_CALLER_TARGET_SDK:

                                updateFgsStartsRestrictionCheckCallerTargetSdk();

                                break;

                            case KEY_DEFERRED_FGS_NOTIFICATIONS_ENABLED:

                                updateFgsNotificationDeferralEnable();

                                break;
@@ -829,6 +846,13 @@ final class ActivityManagerConstants extends ContentObserver { 
                /*defaultValue*/ true);

    }



    private void updateFgsStartsRestrictionCheckCallerTargetSdk() {

        mFgsStartRestrictionCheckCallerTargetSdk = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                KEY_DEFAULT_FGS_STARTS_RESTRICTION_CHECK_CALLER_TARGET_SDK,

                /*defaultValue*/ true);

    }



    private void updateFgsNotificationDeferralEnable() {

        mFlagFgsNotificationDeferralEnabled = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
@@ -1090,6 +1114,14 @@ final class ActivityManagerConstants extends ContentObserver { 
        pw.println(mFgToBgFgsGraceDuration);

        pw.print("  "); pw.print(KEY_FGS_START_FOREGROUND_TIMEOUT); pw.print("=");

        pw.println(mFgsStartForegroundTimeoutMs);

        pw.print("  "); pw.print(KEY_DEFAULT_BACKGROUND_ACTIVITY_STARTS_ENABLED); pw.print("=");

        pw.println(mFlagBackgroundActivityStartsEnabled);

        pw.print("  "); pw.print(KEY_DEFAULT_BACKGROUND_FGS_STARTS_RESTRICTION_ENABLED);

        pw.print("="); pw.println(mFlagBackgroundFgsStartRestrictionEnabled);

        pw.print("  "); pw.print(KEY_DEFAULT_FGS_STARTS_RESTRICTION_ENABLED); pw.print("=");

        pw.println(mFlagFgsStartRestrictionEnabled);

        pw.print("  "); pw.print(KEY_DEFAULT_FGS_STARTS_RESTRICTION_CHECK_CALLER_TARGET_SDK);

        pw.print("="); pw.println(mFgsStartRestrictionCheckCallerTargetSdk);



        pw.println();

        if (mOverrideMaxCachedProcesses >= 0) {