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

Commit 8de96583 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

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

Change-Id: Ideecebc78fd079891efa4664ed2679d4c8bfa46e
parents 544886d6 1e6ef932

api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -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;

  }

core/java/android/window/DisplayAreaInfo.java

+6 −1
Original line number Diff line number Diff line
@@ -43,15 +43,19 @@ public final class DisplayAreaInfo implements Parcelable { 
     */

    public final int displayId;



    public DisplayAreaInfo(@NonNull WindowContainerToken token, int displayId) {

    public final int featureId;



    public DisplayAreaInfo(@NonNull WindowContainerToken token, int displayId, int featureId) {

        this.token = token;

        this.displayId = displayId;

        this.featureId = featureId;

    }



    private DisplayAreaInfo(Parcel in) {

        token = WindowContainerToken.CREATOR.createFromParcel(in);

        configuration.readFromParcel(in);

        displayId = in.readInt();

        featureId = in.readInt();

    }



    @Override
@@ -59,6 +63,7 @@ public final class DisplayAreaInfo implements Parcelable { 
        token.writeToParcel(dest, flags);

        configuration.writeToParcel(dest, flags);

        dest.writeInt(displayId);

        dest.writeInt(featureId);

    }



    @NonNull

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

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { 


    DisplayAreaInfo getDisplayAreaInfo() {

        DisplayAreaInfo info = new DisplayAreaInfo(mRemoteToken.toWindowContainerToken(),

                getDisplayContent().getDisplayId());

                getDisplayContent().getDisplayId(), mFeatureId);

        info.configuration.setTo(getConfiguration());

        return info;

    }