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

Commit 762d9a2c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Dump type from DisplayInfo" into main

parents 0a3c51b0 6f5dbbe6

core/java/android/view/DisplayInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.view.DisplayInfoProto.FLAGS; 
import static android.view.DisplayInfoProto.LOGICAL_HEIGHT;

import static android.view.DisplayInfoProto.LOGICAL_WIDTH;

import static android.view.DisplayInfoProto.NAME;

import static android.view.DisplayInfoProto.TYPE;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -961,6 +962,7 @@ public final class DisplayInfo implements Parcelable { 
        protoOutputStream.write(APP_HEIGHT, appHeight);

        protoOutputStream.write(NAME, name);

        protoOutputStream.write(FLAGS, flags);

        protoOutputStream.write(TYPE, type);

        if (displayCutout != null) {

            displayCutout.dumpDebug(protoOutputStream, CUTOUT);

        }

core/proto/android/view/displayinfo.proto

+1 −0
Original line number Diff line number Diff line
@@ -36,4 +36,5 @@ message DisplayInfoProto { 
    optional string name = 5;

    optional int32 flags = 6;

    optional DisplayCutoutProto cutout = 7;

    optional int32 type = 8;

}