From 9a478d2e325876334100b9f5033c087945c352eb Mon Sep 17 00:00:00 2001
From: Kweku Adams <kwekua@google.com>
Date: Thu, 14 Dec 2017 12:56:28 -0800
Subject: [PATCH] incidentd: Adding graphicsstats dump.

Thanks to ag/3249934, the graphicsstats.proto file no longer needs to
explicitly declare "optimize_for = LITE_RUNTIME".

Bug: 65750815
Test: flash device and check incident.proto output.
Change-Id: I2d3d44d5351c225b2cd45bab0ed3a435a4467187
---
 core/proto/android/os/incident.proto           | 8 +++++++-
 core/proto/android/service/graphicsstats.proto | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/proto/android/os/incident.proto b/core/proto/android/os/incident.proto
index 4015a7e7cea96..340d5ae35393c 100644
--- a/core/proto/android/os/incident.proto
+++ b/core/proto/android/os/incident.proto
@@ -28,13 +28,14 @@ import "frameworks/base/core/proto/android/os/system_properties.proto";
 import "frameworks/base/core/proto/android/providers/settings.proto";
 import "frameworks/base/core/proto/android/server/activitymanagerservice.proto";
 import "frameworks/base/core/proto/android/server/alarmmanagerservice.proto";
-import "frameworks/base/core/proto/android/server/windowmanagerservice.proto";
 import "frameworks/base/core/proto/android/server/fingerprint.proto";
 import "frameworks/base/core/proto/android/server/powermanagerservice.proto";
+import "frameworks/base/core/proto/android/server/windowmanagerservice.proto";
 import "frameworks/base/core/proto/android/service/appwidget.proto";
 import "frameworks/base/core/proto/android/service/battery.proto";
 import "frameworks/base/core/proto/android/service/batterystats.proto";
 import "frameworks/base/core/proto/android/service/diskstats.proto";
+import "frameworks/base/core/proto/android/service/graphicsstats.proto";
 import "frameworks/base/core/proto/android/service/netstats.proto";
 import "frameworks/base/core/proto/android/service/notification.proto";
 import "frameworks/base/core/proto/android/service/package.proto";
@@ -178,4 +179,9 @@ message IncidentProto {
         (section).type = SECTION_DUMPSYS,
         (section).args = "meminfo --proto"
     ];
+
+    optional android.service.GraphicsStatsServiceDumpProto graphicsstats = 3019 [
+        (section).type = SECTION_DUMPSYS,
+        (section).args = "graphicsstats --proto"
+    ];
 }
diff --git a/core/proto/android/service/graphicsstats.proto b/core/proto/android/service/graphicsstats.proto
index 801411dbed13e..f42206562fc47 100644
--- a/core/proto/android/service/graphicsstats.proto
+++ b/core/proto/android/service/graphicsstats.proto
@@ -19,7 +19,6 @@ package android.service;
 
 option java_multiple_files = true;
 option java_outer_classname = "GraphicsStatsServiceProto";
-option optimize_for = LITE_RUNTIME;
 
 message GraphicsStatsServiceDumpProto {
     repeated GraphicsStatsProto stats = 1;