Merge "Added onDisplayAreaChanged and unregister for DisplayAreaOrganizer" into rvc-dev am: cd220824de

Change-Id: I7d93eed9d52a5b9dfa0e6824bea90901d14fd88e

core/java/android/window/DisplayAreaOrganizer.java

@@ -52,10 +52,27 @@ public class DisplayAreaOrganizer extends WindowOrganizer {
         }
     }
 
+    /**
+     * @hide
+     */
+    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)
+    public void unregisterOrganizer() {
+        try {
+            getController().unregisterOrganizer(mInterface);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
     public void onDisplayAreaAppeared(@NonNull DisplayAreaInfo displayAreaInfo) {}
 
     public void onDisplayAreaVanished(@NonNull DisplayAreaInfo displayAreaInfo) {}
 
+    /**
+     * @hide
+     */
+    public void onDisplayAreaInfoChanged(@NonNull DisplayAreaInfo displayAreaInfo) {}
+
     private final IDisplayAreaOrganizer mInterface = new IDisplayAreaOrganizer.Stub() {
 
         @Override
@@ -67,6 +84,11 @@ public class DisplayAreaOrganizer extends WindowOrganizer {
         public void onDisplayAreaVanished(@NonNull DisplayAreaInfo displayAreaInfo) {
             DisplayAreaOrganizer.this.onDisplayAreaVanished(displayAreaInfo);
         }
+
+        @Override
+        public void onDisplayAreaInfoChanged(@NonNull DisplayAreaInfo displayAreaInfo) {
+            DisplayAreaOrganizer.this.onDisplayAreaInfoChanged(displayAreaInfo);
+        }
     };
 
     private static IDisplayAreaOrganizerController getController() {

core/java/android/window/IDisplayAreaOrganizer.aidl

@@ -25,4 +25,5 @@ import android.window.DisplayAreaInfo;
 oneway interface IDisplayAreaOrganizer {
     void onDisplayAreaAppeared(in DisplayAreaInfo displayAreaInfo);
     void onDisplayAreaVanished(in DisplayAreaInfo displayAreaInfo);
+    void onDisplayAreaInfoChanged(in DisplayAreaInfo displayAreaInfo);
 }

core/java/android/window/IDisplayAreaOrganizerController.aidl

@@ -23,4 +23,9 @@ interface IDisplayAreaOrganizerController {
 
     /** Register a DisplayAreaOrganizer to manage display areas for a given feature. */
     void registerOrganizer(in IDisplayAreaOrganizer organizer, int displayAreaFeature);
+
+    /**
+     * Unregisters a previously registered display area organizer.
+     */
+    void unregisterOrganizer(in IDisplayAreaOrganizer organizer);
 }