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

Commit 904f1897 authored by Yan Zhu's avatar Yan Zhu Committed by Android (Google) Code Review
Browse files

Merge "Add flag info to displays dump output proto"

parents 39ea4eb9 39b0e9a0

core/java/android/view/DisplayInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.view; 


import static android.view.DisplayInfoProto.APP_HEIGHT;

import static android.view.DisplayInfoProto.APP_WIDTH;

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;
@@ -708,6 +709,7 @@ public final class DisplayInfo implements Parcelable { 
        protoOutputStream.write(APP_WIDTH, appWidth);

        protoOutputStream.write(APP_HEIGHT, appHeight);

        protoOutputStream.write(NAME, name);

        protoOutputStream.write(FLAGS, flags);

        protoOutputStream.end(token);

    }

core/proto/android/view/displayinfo.proto

+1 −0
Original line number Diff line number Diff line
@@ -33,4 +33,5 @@ message DisplayInfoProto { 
    // The human-readable name of the display.

    // Eg: "Built-in Screen"

    optional string name = 5;

    optional int32 flags = 6;

}