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

Commit d0412b33 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Switched ActivityRecord.service to ActivityTaskManagerService (5/n) 

Objects that contain or represent activities like ActivityRecord can
no longer rely on ActivityManagerService as it is going to be in a
different package.

Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: I7eabc9b80e494367d79ff7452c88ba82ff216bcd
parent 35feb779

core/java/android/app/ActivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4048,7 +4048,7 @@ public class ActivityManager { 
     */

    public static void setVrThread(int tid) {

        try {

            getService().setVrThread(tid);

            getTaskService().setVrThread(tid);

        } catch (RemoteException e) {

            // pass

        }

core/java/android/app/ActivityManagerInternal.java

+0 −5
Original line number Diff line number Diff line
@@ -143,11 +143,6 @@ public abstract class ActivityManagerInternal { 
     */

    public abstract void notifyNetworkPolicyRulesUpdated(int uid, long procStateSeq);



    /**

     * Called after the voice interaction service has changed.

     */

    public abstract void notifyActiveVoiceInteractionServiceChanged(ComponentName component);



    /**

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

     * activity manager.

core/java/android/app/ActivityTaskManagerInternal.java

+5 −0
Original line number Diff line number Diff line
@@ -238,4 +238,9 @@ public abstract class ActivityTaskManagerInternal { 
     */

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



    /**

     * Called after the voice interaction service has changed.

     */

    public abstract void notifyActiveVoiceInteractionServiceChanged(ComponentName component);



}

core/java/android/app/IActivityManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -465,7 +465,6 @@ interface IActivityManager { 
    boolean isBackgroundRestricted(in String packageName);



    // Start of N MR1 transactions

    void setVrThread(int tid);

    void setRenderThread(int tid);

    /**

     * Lets activity manager know whether the calling process is currently showing "top-level" UI

core/java/android/app/IActivityTaskManager.aidl

+3 −0
Original line number Diff line number Diff line
@@ -415,4 +415,7 @@ interface IActivityTaskManager { 


    /** @see android.app.ActivityManager#alwaysShowUnsupportedCompileSdkWarning */

    void alwaysShowUnsupportedCompileSdkWarning(in ComponentName activity);



    void setVrThread(int tid);

    void setPersistentVrThread(int tid);

}