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

Commit 6767eaee authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Split internal interface activities from current AM interface (3/n) 

3rd step in unifying the window hierarchy that is currently split
within AM and WM packages. We separate the the internal interface used
to communicate within system server dealing with activities and their
containers (tasks, stack, display) from the rest of AM internal
interface.

Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: Idad77721c1fe10621b9be5dced42a0a11f0183e5
parent f276a6ff

core/java/android/app/ActivityManagerInternal.java

+0 −203
Original line number Diff line number Diff line
@@ -40,61 +40,6 @@ import java.util.List; 
 */

public abstract class ActivityManagerInternal {



    /**

     * Type for {@link #notifyAppTransitionStarting}: The transition was started because we drew

     * the splash screen.

     */

    public static final int APP_TRANSITION_SPLASH_SCREEN =

              AppProtoEnums.APP_TRANSITION_SPLASH_SCREEN; // 1



    /**

     * Type for {@link #notifyAppTransitionStarting}: The transition was started because we all

     * app windows were drawn

     */

    public static final int APP_TRANSITION_WINDOWS_DRAWN =

              AppProtoEnums.APP_TRANSITION_WINDOWS_DRAWN; // 2



    /**

     * Type for {@link #notifyAppTransitionStarting}: The transition was started because of a

     * timeout.

     */

    public static final int APP_TRANSITION_TIMEOUT =

              AppProtoEnums.APP_TRANSITION_TIMEOUT; // 3



    /**

     * Type for {@link #notifyAppTransitionStarting}: The transition was started because of a

     * we drew a task snapshot.

     */

    public static final int APP_TRANSITION_SNAPSHOT =

              AppProtoEnums.APP_TRANSITION_SNAPSHOT; // 4



    /**

     * Type for {@link #notifyAppTransitionStarting}: The transition was started because it was a

     * recents animation and we only needed to wait on the wallpaper.

     */

    public static final int APP_TRANSITION_RECENTS_ANIM =

            AppProtoEnums.APP_TRANSITION_RECENTS_ANIM; // 5



    /**

     * The bundle key to extract the assist data.

     */

    public static final String ASSIST_KEY_DATA = "data";



    /**

     * The bundle key to extract the assist structure.

     */

    public static final String ASSIST_KEY_STRUCTURE = "structure";



    /**

     * The bundle key to extract the assist content.

     */

    public static final String ASSIST_KEY_CONTENT = "content";



    /**

     * The bundle key to extract the assist receiver extras.

     */

    public static final String ASSIST_KEY_RECEIVER_EXTRAS = "receiverExtras";





    /**

     * Grant Uri permissions from one app to another. This method only extends
@@ -117,34 +62,6 @@ public abstract class ActivityManagerInternal { 
    public abstract boolean startIsolatedProcess(String entryPoint, String[] mainArgs,

            String processName, String abiOverride, int uid, Runnable crashHandler);



    /**

     * Acquires a sleep token for the specified display with the specified tag.

     *

     * @param tag A string identifying the purpose of the token (eg. "Dream").

     * @param displayId The display to apply the sleep token to.

     */

    public abstract SleepToken acquireSleepToken(@NonNull String tag, int displayId);



    /**

     * Sleep tokens cause the activity manager to put the top activity to sleep.

     * They are used by components such as dreams that may hide and block interaction

     * with underlying activities.

     */

    public static abstract class SleepToken {



        /**

         * Releases the sleep token.

         */

        public abstract void release();

    }



    /**

     * Returns home activity for the specified user.

     *

     * @param userId ID of the user or {@link android.os.UserHandle#USER_ALL}

     */

    public abstract ComponentName getHomeActivityForUser(int userId);



    /**

     * Called when a user has been deleted. This can happen during normal device usage

     * or just at startup, when partially removed users are purged. Any state persisted by the
@@ -154,44 +71,6 @@ public abstract class ActivityManagerInternal { 
     */

    public abstract void onUserRemoved(int userId);



    public abstract void onLocalVoiceInteractionStarted(IBinder callingActivity,

            IVoiceInteractionSession mSession,

            IVoiceInteractor mInteractor);



    /**

     * Callback for window manager to let activity manager know that we are finally starting the

     * app transition;

     *

     * @param reasons A map from windowing mode to a reason integer why the transition was started,

     *                which must be one of the APP_TRANSITION_* values.

     * @param timestamp The time at which the app transition started in

     *                  {@link SystemClock#uptimeMillis()} timebase.

     */

    public abstract void notifyAppTransitionStarting(SparseIntArray reasons, long timestamp);



    /**

     * Callback for window manager to let activity manager know that the app transition was

     * cancelled.

     */

    public abstract void notifyAppTransitionCancelled();



    /**

     * Callback for window manager to let activity manager know that the app transition is finished.

     */

    public abstract void notifyAppTransitionFinished();



    /**

     * Returns the top activity from each of the currently visible stacks. The first entry will be

     * the focused activity.

     */

    public abstract List<IBinder> getTopVisibleActivities();



    /**

     * Callback for window manager to let activity manager know that docked stack changes its

     * minimized state.

     */

    public abstract void notifyDockedStackMinimizedChanged(boolean minimized);



    /**

     * Kill foreground apps from the specified user.

     */
@@ -224,28 +103,6 @@ public abstract class ActivityManagerInternal { 
    public abstract void updatePersistentConfigurationForUser(@NonNull Configuration values,

            int userId);



    /**

     * Start activity {@code intents} as if {@code packageName} on user {@code userId} did it.

     *

     * - DO NOT call it with the calling UID cleared.

     * - All the necessary caller permission checks must be done at callsites.

     *

     * @return error codes used by {@link IActivityManager#startActivity} and its siblings.

     */

    public abstract int startActivitiesAsPackage(String packageName,

            int userId, Intent[] intents, Bundle bOptions);



    /**

     * Start activity {@code intent} without calling user-id check.

     *

     * - DO NOT call it with the calling UID cleared.

     * - The caller must do the calling user ID check.

     *

     * @return error codes used by {@link IActivityManager#startActivity} and its siblings.

     */

    public abstract int startActivityAsUser(IApplicationThread caller, String callingPackage,

            Intent intent, @Nullable Bundle options, int userId);



    /**

     * Get the procstate for the UID.  The return value will be between

     * {@link ActivityManager#MIN_PROCESS_STATE} and {@link ActivityManager#MAX_PROCESS_STATE}.
@@ -254,25 +111,11 @@ public abstract class ActivityManagerInternal { 
     */

    public abstract int getUidProcessState(int uid);



    /**

     * Called when Keyguard flags might have changed.

     *

     * @param callback Callback to run after activity visibilities have been reevaluated. This can

     *                 be used from window manager so that when the callback is called, it's

     *                 guaranteed that all apps have their visibility updated accordingly.

     */

    public abstract void notifyKeyguardFlagsChanged(@Nullable Runnable callback);



    /**

     * @return {@code true} if system is ready, {@code false} otherwise.

     */

    public abstract boolean isSystemReady();



    /**

     * Called when the trusted state of Keyguard has changed.

     */

    public abstract void notifyKeyguardTrustedChanged();



    /**

     * Sets if the given pid has an overlay UI or not.

     *
@@ -305,13 +148,6 @@ public abstract class ActivityManagerInternal { 
     */

    public abstract void notifyActiveVoiceInteractionServiceChanged(ComponentName component);



    /**

     * Called after virtual display Id is updated by

     * {@link com.android.server.vr.Vr2dDisplay} with a specific

     * {@param vr2dDisplayId}.

     */

    public abstract void setVr2dDisplayId(int vr2dDisplayId);



    /**

     * Saves the current activity manager state and includes the saved state in the next dump of

     * activity manager.
@@ -323,12 +159,6 @@ public abstract class ActivityManagerInternal { 
     */

    public abstract void clearSavedANRState();



    /**

     * Set focus on an activity.

     * @param token The IApplicationToken for the activity

     */

    public abstract void setFocusedActivity(IBinder token);



    /**

     * Set a uid that is allowed to bypass stopped app switches, launching an app

     * whenever it wants.
@@ -345,18 +175,6 @@ public abstract class ActivityManagerInternal { 
     */

    public abstract boolean isRuntimeRestarted();



    /**

     * Returns {@code true} if {@code uid} is running an activity from {@code packageName}.

     */

    public abstract boolean hasRunningActivity(int uid, @Nullable String packageName);



    public interface ScreenObserver {

        public void onAwakeStateChanged(boolean isAwake);

        public void onKeyguardStateChanged(boolean isShowing);

    }



    public abstract void registerScreenObserver(ScreenObserver observer);



    /**

     * Returns if more users can be started without stopping currently running users.

     */
@@ -377,21 +195,6 @@ public abstract class ActivityManagerInternal { 
     */

    public abstract int getMaxRunningUsers();



    /**

     * Returns is the caller has the same uid as the Recents component

     */

    public abstract boolean isCallerRecents(int callingUid);



    /**

     * Returns whether the recents component is the home activity for the given user.

     */

    public abstract boolean isRecentsComponentHomeActivity(int userId);



    /**

     * Cancels any currently running recents animation.

     */

    public abstract void cancelRecentsAnimation(boolean restoreHomeStackPosition);



    /**

     * Whether an UID is active or idle.

     */
@@ -401,10 +204,4 @@ public abstract class ActivityManagerInternal { 
     * Returns a list that contains the memory stats for currently running processes.

     */

    public abstract List<ProcessMemoryState> getMemoryStateForProcesses();



    /**

     * This enforces {@code func} can only be called if either the caller is Recents activity or

     * has {@code permission}.

     */

    public abstract void enforceCallerIsRecentsOrHasPermission(String permission, String func);

}

core/java/android/app/ActivityTaskManagerInternal.java

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

 * Copyright (C) 2018 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 android.app;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.ComponentName;

import android.content.Intent;

import android.os.Bundle;

import android.os.IBinder;

import android.os.SystemClock;

import android.service.voice.IVoiceInteractionSession;

import android.util.SparseIntArray;

import android.view.RemoteAnimationAdapter;



import com.android.internal.app.IVoiceInteractor;



import java.util.List;



/**

 * Activity Task manager local system service interface.

 * @hide Only for use within system server

 */

public abstract class ActivityTaskManagerInternal {



    /**

     * Type for {@link #notifyAppTransitionStarting}: The transition was started because we drew

     * the splash screen.

     */

    public static final int APP_TRANSITION_SPLASH_SCREEN =

              AppProtoEnums.APP_TRANSITION_SPLASH_SCREEN; // 1



    /**

     * Type for {@link #notifyAppTransitionStarting}: The transition was started because we all

     * app windows were drawn

     */

    public static final int APP_TRANSITION_WINDOWS_DRAWN =

              AppProtoEnums.APP_TRANSITION_WINDOWS_DRAWN; // 2



    /**

     * Type for {@link #notifyAppTransitionStarting}: The transition was started because of a

     * timeout.

     */

    public static final int APP_TRANSITION_TIMEOUT =

              AppProtoEnums.APP_TRANSITION_TIMEOUT; // 3



    /**

     * Type for {@link #notifyAppTransitionStarting}: The transition was started because of a

     * we drew a task snapshot.

     */

    public static final int APP_TRANSITION_SNAPSHOT =

              AppProtoEnums.APP_TRANSITION_SNAPSHOT; // 4



    /**

     * Type for {@link #notifyAppTransitionStarting}: The transition was started because it was a

     * recents animation and we only needed to wait on the wallpaper.

     */

    public static final int APP_TRANSITION_RECENTS_ANIM =

            AppProtoEnums.APP_TRANSITION_RECENTS_ANIM; // 5



    /**

     * The bundle key to extract the assist data.

     */

    public static final String ASSIST_KEY_DATA = "data";



    /**

     * The bundle key to extract the assist structure.

     */

    public static final String ASSIST_KEY_STRUCTURE = "structure";



    /**

     * The bundle key to extract the assist content.

     */

    public static final String ASSIST_KEY_CONTENT = "content";



    /**

     * The bundle key to extract the assist receiver extras.

     */

    public static final String ASSIST_KEY_RECEIVER_EXTRAS = "receiverExtras";



    public interface ScreenObserver {

        void onAwakeStateChanged(boolean isAwake);

        void onKeyguardStateChanged(boolean isShowing);

    }



    /**

     * Sleep tokens cause the activity manager to put the top activity to sleep.

     * They are used by components such as dreams that may hide and block interaction

     * with underlying activities.

     */

    public static abstract class SleepToken {



        /** Releases the sleep token. */

        public abstract void release();

    }



    /**

     * Acquires a sleep token for the specified display with the specified tag.

     *

     * @param tag A string identifying the purpose of the token (eg. "Dream").

     * @param displayId The display to apply the sleep token to.

     */

    public abstract SleepToken acquireSleepToken(@NonNull String tag, int displayId);



    /**

     * Returns home activity for the specified user.

     *

     * @param userId ID of the user or {@link android.os.UserHandle#USER_ALL}

     */

    public abstract ComponentName getHomeActivityForUser(int userId);



    public abstract void onLocalVoiceInteractionStarted(IBinder callingActivity,

            IVoiceInteractionSession mSession,

            IVoiceInteractor mInteractor);



    /**

     * Callback for window manager to let activity manager know that we are finally starting the

     * app transition;

     *

     * @param reasons A map from windowing mode to a reason integer why the transition was started,

     *                which must be one of the APP_TRANSITION_* values.

     * @param timestamp The time at which the app transition started in

     *                  {@link SystemClock#uptimeMillis()} timebase.

     */

    public abstract void notifyAppTransitionStarting(SparseIntArray reasons, long timestamp);



    /**

     * Callback for window manager to let activity manager know that the app transition was

     * cancelled.

     */

    public abstract void notifyAppTransitionCancelled();



    /**

     * Callback for window manager to let activity manager know that the app transition is finished.

     */

    public abstract void notifyAppTransitionFinished();



    /**

     * Returns the top activity from each of the currently visible stacks. The first entry will be

     * the focused activity.

     */

    public abstract List<IBinder> getTopVisibleActivities();



    /**

     * Callback for window manager to let activity manager know that docked stack changes its

     * minimized state.

     */

    public abstract void notifyDockedStackMinimizedChanged(boolean minimized);



    /**

     * Start activity {@code intents} as if {@code packageName} on user {@code userId} did it.

     *

     * - DO NOT call it with the calling UID cleared.

     * - All the necessary caller permission checks must be done at callsites.

     *

     * @return error codes used by {@link IActivityManager#startActivity} and its siblings.

     */

    public abstract int startActivitiesAsPackage(String packageName,

            int userId, Intent[] intents, Bundle bOptions);



    /**

     * Start activity {@code intent} without calling user-id check.

     *

     * - DO NOT call it with the calling UID cleared.

     * - The caller must do the calling user ID check.

     *

     * @return error codes used by {@link IActivityManager#startActivity} and its siblings.

     */

    public abstract int startActivityAsUser(IApplicationThread caller, String callingPackage,

            Intent intent, @Nullable Bundle options, int userId);



    /**

     * Called when Keyguard flags might have changed.

     *

     * @param callback Callback to run after activity visibilities have been reevaluated. This can

     *                 be used from window manager so that when the callback is called, it's

     *                 guaranteed that all apps have their visibility updated accordingly.

     */

    public abstract void notifyKeyguardFlagsChanged(@Nullable Runnable callback);



    /**

     * Called when the trusted state of Keyguard has changed.

     */

    public abstract void notifyKeyguardTrustedChanged();



    /**

     * Called after virtual display Id is updated by

     * {@link com.android.server.vr.Vr2dDisplay} with a specific

     * {@param vr2dDisplayId}.

     */

    public abstract void setVr2dDisplayId(int vr2dDisplayId);



    /**

     * Set focus on an activity.

     * @param token The IApplicationToken for the activity

     */

    public abstract void setFocusedActivity(IBinder token);



    /**

     * Returns {@code true} if {@code uid} is running an activity from {@code packageName}.

     */

    public abstract boolean hasRunningActivity(int uid, @Nullable String packageName);



    public abstract void registerScreenObserver(ScreenObserver observer);



    /**

     * Returns is the caller has the same uid as the Recents component

     */

    public abstract boolean isCallerRecents(int callingUid);



    /**

     * Returns whether the recents component is the home activity for the given user.

     */

    public abstract boolean isRecentsComponentHomeActivity(int userId);



    /**

     * Cancels any currently running recents animation.

     */

    public abstract void cancelRecentsAnimation(boolean restoreHomeStackPosition);



    /**

     * This enforces {@code func} can only be called if either the caller is Recents activity or

     * has {@code permission}.

     */

    public abstract void enforceCallerIsRecentsOrHasPermission(String permission, String func);



}

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.accessibilityservice.IAccessibilityServiceClient; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityManagerInternal;

import android.app.ActivityTaskManagerInternal;

import android.app.AlertDialog;

import android.app.AppOpsManager;

import android.app.PendingIntent;
@@ -2624,7 +2625,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                    PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY, 0);



            if (activityToken != null) {

                LocalServices.getService(ActivityManagerInternal.class)

                LocalServices.getService(ActivityTaskManagerInternal.class)

                        .setFocusedActivity(activityToken);

            }

            connection.mConnection.performAccessibilityAction(accessibilityNodeId, action,

services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.annotation.Nullable; 
import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.app.ActivityManagerInternal;

import android.app.ActivityTaskManagerInternal;

import android.app.AppGlobals;

import android.app.IActivityManager;

import android.app.IActivityTaskManager;
@@ -533,7 +534,7 @@ final class AutofillManagerServiceImpl { 
        } catch (NameNotFoundException e) {

            throw new SecurityException("Could not verify UID for " + componentName);

        }

        if (callingUid != packageUid && !LocalServices.getService(ActivityManagerInternal.class)

        if (callingUid != packageUid && !LocalServices.getService(ActivityTaskManagerInternal.class)

                .hasRunningActivity(callingUid, packageName)) {

            final String[] packages = pm.getPackagesForUid(callingUid);

            final String callingPackage = packages != null ? packages[0] : "uid-" + callingUid;

services/autofill/java/com/android/server/autofill/Session.java

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.server.autofill;



import static android.app.ActivityManagerInternal.ASSIST_KEY_RECEIVER_EXTRAS;

import static android.app.ActivityManagerInternal.ASSIST_KEY_STRUCTURE;

import static android.app.ActivityTaskManagerInternal.ASSIST_KEY_RECEIVER_EXTRAS;

import static android.app.ActivityTaskManagerInternal.ASSIST_KEY_STRUCTURE;

import static android.service.autofill.AutofillFieldClassificationService.EXTRA_SCORES;

import static android.service.autofill.FillRequest.FLAG_MANUAL_REQUEST;

import static android.service.autofill.FillRequest.INVALID_REQUEST_ID;