From 1f34774d36ee516c60aa42096424a3943c7fd694 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Tue, 3 Nov 2020 12:47:34 -0800 Subject: [PATCH] Update DisplayAreaOrganizer document We are not allowing client to register for feature that has alreay been registered. Update the doument to make it clear. Fix: 172027455 Test: just document update Change-Id: I66823d073aaf65eef044329b6f793f58a0643643 --- core/java/android/window/DisplayAreaOrganizer.java | 4 +++- core/java/android/window/IDisplayAreaOrganizerController.aidl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/window/DisplayAreaOrganizer.java b/core/java/android/window/DisplayAreaOrganizer.java index 6ec093e045fae..bc3e35ccb8a9c 100644 --- a/core/java/android/window/DisplayAreaOrganizer.java +++ b/core/java/android/window/DisplayAreaOrganizer.java @@ -88,9 +88,11 @@ public class DisplayAreaOrganizer extends WindowOrganizer { public static final int FEATURE_VENDOR_FIRST = FEATURE_SYSTEM_LAST + 1; /** - * Registers a DisplayAreaOrganizer to manage display areas for a given feature. + * Registers a DisplayAreaOrganizer to manage display areas for a given feature. A feature can + * not be registered by multiple organizers at the same time. * * @return a list of display areas that should be managed by the organizer. + * @throws IllegalStateException if the feature has already been registered. */ @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) @CallSuper diff --git a/core/java/android/window/IDisplayAreaOrganizerController.aidl b/core/java/android/window/IDisplayAreaOrganizerController.aidl index 8943847073c7d..edabcf8ad0de5 100644 --- a/core/java/android/window/IDisplayAreaOrganizerController.aidl +++ b/core/java/android/window/IDisplayAreaOrganizerController.aidl @@ -24,9 +24,11 @@ import android.window.IDisplayAreaOrganizer; interface IDisplayAreaOrganizerController { /** - * Registers a DisplayAreaOrganizer to manage display areas for a given feature. + * Registers a DisplayAreaOrganizer to manage display areas for a given feature. A feature can + * not be registered by multiple organizers at the same time. * * @return a list of display areas that should be managed by the organizer. + * @throws IllegalStateException if the feature has already been registered. */ ParceledListSlice registerOrganizer(in IDisplayAreaOrganizer organizer, int displayAreaFeature);