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

Commit 8cbef141 authored by Calvin Huang's avatar Calvin Huang Committed by Android (Google) Code Review
Browse files

Merge "Keep DisplayAreaGroup and DisplayAreaPolicyBuilder in services.jar"

parents 7dab5f76 67c3f0b9

services/core/java/com/android/server/wm/DisplayAreaGroup.java

+3 −0
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ import android.content.pm.ActivityInfo; 
import android.content.res.Configuration;

import android.graphics.Rect;



import com.android.internal.annotations.Keep;



/** The root of a partition of the logical display. */

@Keep

class DisplayAreaGroup extends RootDisplayArea {



    DisplayAreaGroup(WindowManagerService wms, String name, int featureId) {

services/core/java/com/android/server/wm/DisplayAreaPolicyBuilder.java

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.util.ArraySet; 
import android.window.DisplayAreaOrganizer;

import android.window.WindowContainerToken;



import com.android.internal.annotations.Keep;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.protolog.common.ProtoLog;

import com.android.server.policy.WindowManagerPolicy;
@@ -142,6 +143,7 @@ import java.util.function.Function; 
 * the window to the corresponding {@link DisplayArea.Tokens} under the returned root

 * {@link RootDisplayArea}.

 */

@Keep

class DisplayAreaPolicyBuilder {



    @Nullable private HierarchyBuilder mRootHierarchyBuilder;