From e1ea147a468b70b16f9bcc92299d54fde99b9c22 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Mon, 22 Feb 2021 22:54:47 -0800
Subject: [PATCH] Display menu if no argument is given.

If not argument is given, the app just sits and wait
for stdin input, this can be confusing for the user.
Add logic to display menu if no argument is given.

Test: metrics_dump
  display menu

Test: metrics_dump [bugreport from sabrina-q.gz]
  display mediadrm and widevine metrics

Test: metrics_dump --mediadrm [adb shell dumpsys media.metrics output]
  display mediadrm metrics

Test: metrics_dump --widevine [adb shell dumpsys media.metrics output]
  display widevine metrics

Test: metrics_dump [bugreport from sabrina-q.gz] --widevine
  display menu because the order is app_name, options, input file

Bug: 180983850
Change-Id: I9b35f782d8f59663661148d3950f89e4724b6bce
---
 libwvdrmengine/tools/metrics_dump/src/metrics_dump.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libwvdrmengine/tools/metrics_dump/src/metrics_dump.cpp b/libwvdrmengine/tools/metrics_dump/src/metrics_dump.cpp
index 8c2ecc78..b3029fcd 100644
--- a/libwvdrmengine/tools/metrics_dump/src/metrics_dump.cpp
+++ b/libwvdrmengine/tools/metrics_dump/src/metrics_dump.cpp
@@ -123,7 +123,7 @@ using std::cerr;
 using std::endl;
 using std::string;
 
-void usage() {
+void exit_with_menu() {
   cerr << "usage: metrics_dump [options] [<bugreport>]" << endl;
   cerr << endl;
   cerr << "Displays the drm metrics that are generated by" << endl;
@@ -146,7 +146,7 @@ void usage() {
   cerr << "  --select <package>|<component>" << endl;
   cerr << "       only show metrics from the specified package or component"
        << endl;
-  exit(-1);
+  exit(0);
 }
 
 int main(int argc, char **argv) {
@@ -155,10 +155,11 @@ int main(int argc, char **argv) {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   int i = 1;
+  if (argc == 1) exit_with_menu();
   while (i < argc) {
     string arg = argv[i];
     if (arg == "--help") {
-      usage();
+      exit_with_menu();
     } else if (arg == "--no-gms") {
       metrics_dump::excluded_ones.push_back("com.google.android.gms");
     } else if (arg == "--widevine") {
@@ -184,7 +185,7 @@ int main(int argc, char **argv) {
         metrics_dump::selected_one = argv[++i];
         metrics_dump::to_lower(metrics_dump::selected_one);
       } else {
-        usage();
+        exit_with_menu();
       }
     }
     i++;