summaryrefslogtreecommitdiff
path: root/core/java/android/view/DisplayInfo.java
diff options
context:
space:
mode:
authorAndrii Kulian <akulian@google.com>2018-02-08 15:12:14 -0800
committerAndrii Kulian <akulian@google.com>2018-02-08 15:12:14 -0800
commit764e104e2838d1eb708876dd7e545e6f8b8a61ba (patch)
tree0ca8d235119c18964fbcef0a084ac2c40f203f92 /core/java/android/view/DisplayInfo.java
parent6a00aac93ada980a08223f61e3021e5c0fcea2b8 (diff)
Added display name to DisplayInfo proto
Bug: 72048469 Test: ActivityManagerMultiDisplayTests Change-Id: Ied6ed9ce26c8ea8fc49c645ecb86dc455255f947
Diffstat (limited to 'core/java/android/view/DisplayInfo.java')
-rw-r--r--core/java/android/view/DisplayInfo.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index 37e9815c93c5..7251b71ac35d 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -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);
}