commit 285cdaf006262af86138d33926ee9ead857ced32
author Idries Hamadi <idries@google.com> Thu Aug 23 17:22:21 2018 +0100
committer Idries Hamadi <idries@google.com> Thu Aug 23 17:24:07 2018 +0100
tree 37e37158bad184a8ea06cf51544297f90b266e2e
parent 8a3489c1dde7a2b1fe35f47fa180e0d14f1d4e19

Address style and efficiency post-merge feedback from previous change (1ecee447abffbc97e2d8bbd7df6252cf9827acf1).

Test: mm
Test: adb install -r -f --force-agent --local-agent ~/example_apks/example.apk
Test: adb install -r -f --no-streaming --force-agent --local-agent ~/example_apks/example.apk
Change-Id: I44105a78c78c6d3c77a6b3b5e14f53cd1707b704

client/fastdeploy.cpp

diff --git a/client/fastdeploy.cpp b/client/fastdeploy.cpp
index cd42b56..fda3889 100644
--- a/client/fastdeploy.cpp
+++ b/client/fastdeploy.cpp
@@ -51,7 +51,7 @@
 
     int statusCode = capture_shell_command("getprop ro.build.version.sdk", &sdkVersionOutputBuffer,
                                            &sdkVersionErrorBuffer);
-    if (statusCode == 0 && statusCode == 0 && sdkVersionOutputBuffer.size() > 0) {
+    if (statusCode == 0 && sdkVersionOutputBuffer.size() > 0) {
         api_level = strtol((char*)sdkVersionOutputBuffer.data(), NULL, 10);
     }
 
@@ -107,7 +107,7 @@
         const char* kChmodCommandPattern = "chmod 777 %sdeployagent.sh";
         std::string chmodCommand =
                 android::base::StringPrintf(kChmodCommandPattern, kDeviceAgentPath);
-        int ret = send_shell_command(chmodCommand.c_str());
+        int ret = send_shell_command(chmodCommand);
         return (ret == 0);
     } else {
         return false;
@@ -248,7 +248,7 @@
     std::vector<char> extractErrorBuffer;
     int statusCode;
     DeployAgentFileCallback cb(outputFp, &extractErrorBuffer, &statusCode);
-    int ret = send_shell_command(extractCommand.c_str(), false, &cb);
+    int ret = send_shell_command(extractCommand, false, &cb);
 
     if (ret == 0) {
         return cb.getBytesWritten();