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

Commit 01be3e60 authored by Achim Thesmann's avatar Achim Thesmann Committed by Automerger Merge Worker
Browse files

Merge "Use calling package name for CompatChange." into udc-dev am: 4cc3a86b am: 509f5b3c 

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



Change-Id: Ic929971d4ce70763fa43f99ece60c23bd32c9a72
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65389087 509f5b3c

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

+11 −8
Original line number Diff line number Diff line
@@ -347,21 +347,22 @@ public final class PendingIntentRecord extends IIntentSender.Stub { 
     * use caller's BAL permission.

     */

    public static BackgroundStartPrivileges getBackgroundStartPrivilegesAllowedByCaller(

            @Nullable ActivityOptions activityOptions, int callingUid) {

            @Nullable ActivityOptions activityOptions, int callingUid,

            @Nullable String callingPackage) {

        if (activityOptions == null) {

            // since the ActivityOptions were not created by the app itself, determine the default

            // for the app

            return getDefaultBackgroundStartPrivileges(callingUid);

            return getDefaultBackgroundStartPrivileges(callingUid, callingPackage);

        }

        return getBackgroundStartPrivilegesAllowedByCaller(activityOptions.toBundle(),

                callingUid);

                callingUid, callingPackage);

    }



    private static BackgroundStartPrivileges getBackgroundStartPrivilegesAllowedByCaller(

            @Nullable Bundle options, int callingUid) {

            @Nullable Bundle options, int callingUid, @Nullable String callingPackage) {

        if (options == null || !options.containsKey(

                        ActivityOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED)) {

            return getDefaultBackgroundStartPrivileges(callingUid);

            return getDefaultBackgroundStartPrivileges(callingUid, callingPackage);

        }

        return options.getBoolean(ActivityOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED)

                ? BackgroundStartPrivileges.ALLOW_BAL
@@ -380,8 +381,10 @@ public final class PendingIntentRecord extends IIntentSender.Stub { 
                    android.Manifest.permission.LOG_COMPAT_CHANGE

            })

    public static BackgroundStartPrivileges getDefaultBackgroundStartPrivileges(

            int callingUid) {

        boolean isChangeEnabledForApp = CompatChanges.isChangeEnabled(

            int callingUid, @Nullable String callingPackage) {

        boolean isChangeEnabledForApp = callingPackage != null ? CompatChanges.isChangeEnabled(

                DEFAULT_RESCIND_BAL_PRIVILEGES_FROM_PENDING_INTENT_SENDER, callingPackage,

                UserHandle.getUserHandleForUid(callingUid)) : CompatChanges.isChangeEnabled(

                DEFAULT_RESCIND_BAL_PRIVILEGES_FROM_PENDING_INTENT_SENDER, callingUid);

        if (isChangeEnabledForApp) {

            return BackgroundStartPrivileges.ALLOW_FGS;
@@ -637,7 +640,7 @@ public final class PendingIntentRecord extends IIntentSender.Stub { 
        // temporarily allow receivers and services to open activities from background if the

        // PendingIntent.send() caller was foreground at the time of sendInner() call

        if (uid != callingUid && controller.mAtmInternal.isUidForeground(callingUid)) {

            return getBackgroundStartPrivilegesAllowedByCaller(options, callingUid);

            return getBackgroundStartPrivilegesAllowedByCaller(options, callingUid, null);

        }

        return BackgroundStartPrivileges.NONE;

    }

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

+42 −3
Original line number Diff line number Diff line
@@ -5337,15 +5337,54 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        return null;

    }



    WindowProcessController getProcessController(int pid, int uid) {

    /**

     * Returns the {@link WindowProcessController} for the app process for the given uid and pid.

     *

     * If no such {@link WindowProcessController} is found, it does not belong to an app, or the

     * pid does not match the uid {@code null} is returned.

     */

    @Nullable WindowProcessController getProcessController(int pid, int uid) {

        return UserHandle.isApp(uid) ? getProcessControllerInternal(pid, uid) : null;

    }



    /**

     * Returns the {@link WindowProcessController} for the given uid and pid.

     *

     * If no such {@link WindowProcessController} is found or the pid does not match the uid

     * {@code null} is returned.

     */

    private @Nullable WindowProcessController getProcessControllerInternal(int pid, int uid) {

        final WindowProcessController proc = mProcessMap.getProcess(pid);

        if (proc == null) return null;

        if (UserHandle.isApp(uid) && proc.mUid == uid) {

        if (proc == null) {

            return null;

        }

        if (proc.mUid == uid) {

            return proc;

        }

        return null;

    }



    /**

     * Returns the package name if (and only if) the package name can be uniquely determined.

     * Otherwise returns {@code null}.

     *

     * The provided pid must match the provided uid, otherwise this also returns null.

     */

    @Nullable String getPackageNameIfUnique(int uid, int pid) {

        WindowProcessController processController = getProcessControllerInternal(pid, uid);

        if (processController == null) {

            Slog.w(TAG, "callingPackage for (uid=" + uid + ", pid=" + pid + ") has no WPC");

            return null;

        }

        List<String> realCallingPackages = processController.getPackageList();

        if (realCallingPackages.size() == 1) {

            return realCallingPackages.get(0);

        }

        Slog.w(TAG, "callingPackage for (uid=" + uid + ", pid=" + pid + ") is ambiguous: "

                + realCallingPackages);

        return null;

    }



    /** A uid is considered to be foreground if it has a visible non-toast window. */

    @HotPath(caller = HotPath.START_SERVICE)

    boolean hasActiveVisibleWindow(int uid) {

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

+10 −4
Original line number Diff line number Diff line
@@ -180,7 +180,8 @@ public class BackgroundActivityStartController { 
            Intent intent,

            ActivityOptions checkedOptions) {

        return checkBackgroundActivityStart(callingUid, callingPid, callingPackage,

                realCallingUid, realCallingPid, callerApp, originatingPendingIntent,

                realCallingUid, realCallingPid,

                callerApp, originatingPendingIntent,

                backgroundStartPrivileges, intent, checkedOptions) == BAL_BLOCK;

    }
@@ -288,11 +289,13 @@ public class BackgroundActivityStartController { 
            }

        }



        String realCallingPackage = mService.getPackageNameIfUnique(realCallingUid, realCallingPid);



        // Legacy behavior allows to use caller foreground state to bypass BAL restriction.

        // The options here are the options passed by the sender and not those on the intent.

        final BackgroundStartPrivileges balAllowedByPiSender =

                PendingIntentRecord.getBackgroundStartPrivilegesAllowedByCaller(

                        checkedOptions, realCallingUid);

                        checkedOptions, realCallingUid, realCallingPackage);



        final boolean logVerdictChangeByPiDefaultChange = checkedOptions == null

                || checkedOptions.getPendingIntentBackgroundActivityStartMode()
@@ -460,8 +463,11 @@ public class BackgroundActivityStartController { 
        // If we are here, it means all exemptions not based on PI sender failed, so we'll block

        // unless resultIfPiSenderAllowsBal is an allow and the PI sender allows BAL



        String realCallingPackage = callingUid == realCallingUid ? callingPackage :

                mService.mContext.getPackageManager().getNameForUid(realCallingUid);

        if (realCallingPackage == null) {

            realCallingPackage = (callingUid == realCallingUid ? callingPackage :

                    mService.mContext.getPackageManager().getNameForUid(realCallingUid))

                    + "[debugOnly]";

        }



        String stateDumpLog = " [callingPackage: " + callingPackage

                + "; callingUid: " + callingUid

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

+6 −0
Original line number Diff line number Diff line
@@ -721,6 +721,12 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
        }

    }



    List<String> getPackageList() {

        synchronized (mPkgList) {

            return new ArrayList<>(mPkgList);

        }

    }



    void addActivityIfNeeded(ActivityRecord r) {

        // even if we already track this activity, note down that it has been launched

        setLastActivityLaunchTime(r);

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

+1 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ public class ActivityStarterTests extends WindowTestsBase { 
                anyInt(), anyInt()));

        doReturn(BackgroundStartPrivileges.allowBackgroundActivityStarts(null)).when(

                () -> PendingIntentRecord.getBackgroundStartPrivilegesAllowedByCaller(

                anyObject(), anyInt()));

                anyObject(), anyInt(), anyObject()));

        runAndVerifyBackgroundActivityStartsSubtest(

                "allowed_notAborted", false,

                UNIMPORTANT_UID, false, PROCESS_STATE_BOUND_TOP,