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

Commit e00fbbe6 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Remove getLeash from WindowContainerToken" into rvc-dev am: 5a4a5682 

Change-Id: If831151d84c02ce9e30fc194f8e0335a5674c738
parents f40f3edd 5a4a5682

api/test-current.txt

+2 −3
Original line number Diff line number Diff line
@@ -5289,7 +5289,7 @@ package android.window { 


  public class DisplayAreaOrganizer extends android.window.WindowOrganizer {

    ctor public DisplayAreaOrganizer();

    method public void onDisplayAreaAppeared(@NonNull android.window.DisplayAreaInfo);

    method public void onDisplayAreaAppeared(@NonNull android.window.DisplayAreaInfo, @NonNull android.view.SurfaceControl);

    method public void onDisplayAreaVanished(@NonNull android.window.DisplayAreaInfo);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void registerOrganizer(int);

    field public static final int FEATURE_DEFAULT_TASK_CONTAINER = 1; // 0x1
@@ -5309,7 +5309,7 @@ package android.window { 
    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public static android.window.WindowContainerToken getImeTarget(int);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public static java.util.List<android.app.ActivityManager.RunningTaskInfo> getRootTasks(int, @NonNull int[]);

    method @BinderThread public void onBackPressedOnTaskRoot(@NonNull android.app.ActivityManager.RunningTaskInfo);

    method @BinderThread public void onTaskAppeared(@NonNull android.app.ActivityManager.RunningTaskInfo);

    method @BinderThread public void onTaskAppeared(@NonNull android.app.ActivityManager.RunningTaskInfo, @NonNull android.view.SurfaceControl);

    method @BinderThread public void onTaskInfoChanged(@NonNull android.app.ActivityManager.RunningTaskInfo);

    method @BinderThread public void onTaskVanished(@NonNull android.app.ActivityManager.RunningTaskInfo);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public final void registerOrganizer(int);
@@ -5320,7 +5320,6 @@ package android.window { 


  public final class WindowContainerToken implements android.os.Parcelable {

    method public int describeContents();

    method @Nullable public android.view.SurfaceControl getLeash();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.window.WindowContainerToken> CREATOR;

  }

core/java/android/window/DisplayAreaOrganizer.java

+6 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.RequiresPermission; 
import android.annotation.TestApi;

import android.os.RemoteException;

import android.util.Singleton;

import android.view.SurfaceControl;



/**

 * Interface for WindowManager to delegate control of display areas.
@@ -64,7 +65,8 @@ public class DisplayAreaOrganizer extends WindowOrganizer { 
        }

    }



    public void onDisplayAreaAppeared(@NonNull DisplayAreaInfo displayAreaInfo) {}

    public void onDisplayAreaAppeared(@NonNull DisplayAreaInfo displayAreaInfo,

            @NonNull SurfaceControl leash) {}



    public void onDisplayAreaVanished(@NonNull DisplayAreaInfo displayAreaInfo) {}
@@ -76,8 +78,9 @@ public class DisplayAreaOrganizer extends WindowOrganizer { 
    private final IDisplayAreaOrganizer mInterface = new IDisplayAreaOrganizer.Stub() {



        @Override

        public void onDisplayAreaAppeared(@NonNull DisplayAreaInfo displayAreaInfo) {

            DisplayAreaOrganizer.this.onDisplayAreaAppeared(displayAreaInfo);

        public void onDisplayAreaAppeared(@NonNull DisplayAreaInfo displayAreaInfo,

                @NonNull SurfaceControl leash) {

            DisplayAreaOrganizer.this.onDisplayAreaAppeared(displayAreaInfo, leash);

        }



        @Override

core/java/android/window/IDisplayAreaOrganizer.aidl

+2 −1
Original line number Diff line number Diff line
@@ -17,13 +17,14 @@ 
package android.window;



import android.window.DisplayAreaInfo;

import android.view.SurfaceControl;



/**

 * Interface for WindowManager to delegate control of display areas.

 * {@hide}

 */

oneway interface IDisplayAreaOrganizer {

    void onDisplayAreaAppeared(in DisplayAreaInfo displayAreaInfo);

    void onDisplayAreaAppeared(in DisplayAreaInfo displayAreaInfo, in SurfaceControl leash);

    void onDisplayAreaVanished(in DisplayAreaInfo displayAreaInfo);

    void onDisplayAreaInfoChanged(in DisplayAreaInfo displayAreaInfo);

}

core/java/android/window/ITaskOrganizer.aidl

+8 −1
Original line number Diff line number Diff line
@@ -25,7 +25,14 @@ import android.window.WindowContainerToken; 
 * {@hide}

 */

oneway interface ITaskOrganizer {

    void onTaskAppeared(in ActivityManager.RunningTaskInfo taskInfo);

    /**

     * A callback when the Task is available for the registered organizer. The client is responsible

     * for releasing the SurfaceControl in the callback.

     *

     * @param taskInfo The information about the Task that's available

     * @param leash A persistent leash for this Task.

     */

    void onTaskAppeared(in ActivityManager.RunningTaskInfo taskInfo, in SurfaceControl leash);

    void onTaskVanished(in ActivityManager.RunningTaskInfo taskInfo);



    /**

core/java/android/window/IWindowContainerToken.aidl

+0 −5
Original line number Diff line number Diff line
@@ -24,9 +24,4 @@ import android.view.SurfaceControl; 
 * @hide

 */

interface IWindowContainerToken {



    /**

     * Gets a persistent leash for this container or {@code null}.

     */

    SurfaceControl getLeash();

}