Merge "Added featureId to DisplayAreaInfo" into rvc-dev am: 1e6ef9321a

Change-Id: Id953960a1495314d241fcff6f9c4e665e8d5cfcb
This commit is contained in:
Chavi Weingarten
2020-04-29 23:24:50 +00:00
committed by Automerger Merge Worker
3 changed files with 9 additions and 3 deletions

View File

@@ -5277,12 +5277,13 @@ package android.widget {
package android.window {
public final class DisplayAreaInfo implements android.os.Parcelable {
ctor public DisplayAreaInfo(@NonNull android.window.WindowContainerToken, int);
ctor public DisplayAreaInfo(@NonNull android.window.WindowContainerToken, int, int);
method public int describeContents();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.window.DisplayAreaInfo> CREATOR;
field @NonNull public final android.content.res.Configuration configuration;
field public final int displayId;
field public final int featureId;
field @NonNull public final android.window.WindowContainerToken token;
}