Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace display area organizer upon registration" into udc-dev

Browse Source
This commit is contained in:
Winson Chung
2023-04-15 16:31:38 +00:00
committed by Android (Google) Code Review
parent 962ee554c7 e8b1cc295d
commit 561aeec10e
3 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/DisplayAreaOrganizerController.java
View File

@@ -135,12 +135,6 @@ public class DisplayAreaOrganizerController extends IDisplayAreaOrganizerControl
ProtoLog.v(WM_DEBUG_WINDOW_ORGANIZER, "Register display organizer=%s uid=%d",
organizer.asBinder(), uid);
if (mOrganizersByFeatureIds.get(feature) != null) {
if (mOrganizersByFeatureIds.get(feature).mOrganizer.asBinder()
.isBinderAlive()) {
throw new IllegalStateException(
"Replacing existing organizer currently unsupported");
}
mOrganizersByFeatureIds.remove(feature).destroy();
Slog.d(TAG, "Replacing dead organizer for feature=" + feature);
}

7
services/tests/wmtests/src/com/android/server/wm/DisplayAreaOrganizerTest.java
View File

@@ -111,13 +111,6 @@ public class DisplayAreaOrganizerTest extends WindowTestsBase {
any(SurfaceControl.class));
}
@Test
public void testRegisterOrganizer_alreadyRegisteredFeature() {
registerMockOrganizer(FEATURE_VENDOR_FIRST);
assertThrows(IllegalStateException.class,
() -> registerMockOrganizer(FEATURE_VENDOR_FIRST));
}
@Test
public void testRegisterOrganizer_ignoreUntrustedDisplay() throws RemoteException {
doReturn(false).when(mDisplayContent).isTrusted();

13
services/tests/wmtests/src/com/android/server/wm/DisplayAreaTest.java
View File

@@ -618,19 +618,6 @@ public class DisplayAreaTest extends WindowTestsBase {
assertThat(info2.rootDisplayAreaId).isEqualTo(root.mFeatureId);
}
@Test
public void testRegisterSameFeatureOrganizer_expectThrowsException() {
final IDisplayAreaOrganizer mockDisplayAreaOrganizer = mock(IDisplayAreaOrganizer.class);
final IBinder binder = mock(IBinder.class);
doReturn(true).when(binder).isBinderAlive();
doReturn(binder).when(mockDisplayAreaOrganizer).asBinder();
final DisplayAreaOrganizerController controller =
mWm.mAtmService.mWindowOrganizerController.mDisplayAreaOrganizerController;
controller.registerOrganizer(mockDisplayAreaOrganizer, FEATURE_VENDOR_FIRST);
assertThrows(IllegalStateException.class,
() -> controller.registerOrganizer(mockDisplayAreaOrganizer, FEATURE_VENDOR_FIRST));
}
@Test
public void testRegisterUnregisterOrganizer() {
final IDisplayAreaOrganizer mockDisplayAreaOrganizer = mock(IDisplayAreaOrganizer.class);