commit d6480caf4d58ff5060fa2fb20a3384bd2bcd38dc
author Martijn Coenen <maco@google.com> Wed Apr 05 14:16:12 2017 -0700
committer Martijn Coenen <maco@google.com> Wed Apr 05 14:18:43 2017 -0700
tree 8d0da2f04f9b8a6b5b7d051f86fdd898ebfdc6f4
parent c428826fdf6208da698fbdb1d49d0b51bfb924b6

Add option to list vndservicemanager services.

Test: adb shell service list -v
Bug: 36987120
Change-Id: I081a0c725ddb4175f4ab43714c25cc41ed2239a3

cmds/service/service.cpp

diff --git a/cmds/service/service.cpp b/cmds/service/service.cpp
index 428b87c..09921e4 100644
--- a/cmds/service/service.cpp
+++ b/cmds/service/service.cpp
@@ -68,18 +68,12 @@
 
 int main(int argc, char* const argv[])
 {
-    sp<IServiceManager> sm = defaultServiceManager();
-    fflush(stdout);
-    if (sm == NULL) {
-        aerr << "service: Unable to get default service manager!" << endl;
-        return 20;
-    }
-    
     bool wantsUsage = false;
+    bool wantsVendorServices = false;
     int result = 0;
     
     while (1) {
-        int ic = getopt(argc, argv, "h?");
+        int ic = getopt(argc, argv, "vh?");
         if (ic < 0)
             break;
 
@@ -88,6 +82,9 @@
         case '?':
             wantsUsage = true;
             break;
+        case 'v':
+            wantsVendorServices = true;
+            break;
         default:
             aerr << "service: Unknown option -" << ic << endl;
             wantsUsage = true;
@@ -95,6 +92,16 @@
             break;
         }
     }
+
+    if (wantsVendorServices) {
+        ProcessState::initWithDriver("/dev/vndbinder");
+    }
+    sp<IServiceManager> sm = defaultServiceManager();
+    fflush(stdout);
+    if (sm == NULL) {
+        aerr << "service: Unable to get default service manager!" << endl;
+        return 20;
+    }
     
     if (optind >= argc) {
         wantsUsage = true;