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

Commit 09726a5d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Added display name to DisplayInfo proto"

parents e4cf2564 764e104e

core/java/android/view/DisplayInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.view.DisplayInfoProto.APP_HEIGHT; 
import static android.view.DisplayInfoProto.APP_WIDTH;

import static android.view.DisplayInfoProto.LOGICAL_HEIGHT;

import static android.view.DisplayInfoProto.LOGICAL_WIDTH;

import static android.view.DisplayInfoProto.NAME;



import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;
@@ -685,6 +686,7 @@ public final class DisplayInfo implements Parcelable { 
        protoOutputStream.write(LOGICAL_HEIGHT, logicalHeight);

        protoOutputStream.write(APP_WIDTH, appWidth);

        protoOutputStream.write(APP_HEIGHT, appHeight);

        protoOutputStream.write(NAME, name);

        protoOutputStream.end(token);

    }

core/proto/android/view/displayinfo.proto

+1 −0
Original line number Diff line number Diff line
@@ -29,4 +29,5 @@ message DisplayInfoProto { 
  optional int32 logical_height = 2;

  optional int32 app_width = 3;

  optional int32 app_height = 4;

  optional string name = 5;

}