add executable shell command method for prompt mode

change dlogutil path

Change-Id: Ic9cefd23f77954f8e014d41f8b700fb6781bd1eb
Signed-off-by: Yoonki Park <yoonki.park@samsung.com>

diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/log/LogTab.java b/org.tizen.common.connection/src/org/tizen/common/connection/log/LogTab.java
index 3c93918..e09cb66 100755 (executable)
--- a/org.tizen.common.connection/src/org/tizen/common/connection/log/LogTab.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/log/LogTab.java
@@ -288,7 +288,7 @@ public class LogTab
 
                     try
                     {
-                        device.executeShellCommand("dlogutil -v long *:" + level.getPriorityLetter(), logReceiver, 0 /* timeout */); //$NON-NLS-1$
+                        device.executeShellCommand("/usr/bin/dlogutil -v long *:" + level.getPriorityLetter(), logReceiver, 0 /* timeout */); //$NON-NLS-1$
                     } catch (Exception e)
                     {
                         Logger.error("LogTab", e);

diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
index 2af1aad..c122c68 100644 (file)
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
@@ -105,6 +105,10 @@ final class Device implements IDevice {
     }
 
     public SdbShellProcess executeShellCommand(String command) throws IOException {
+        return (SdbShellProcess) executeShellCommand(command, true);
+    }
+
+    public Process executeShellCommand(String command, boolean prompt) throws IOException {
         SmartDevelopmentBridge sdb = SmartDevelopmentBridge.getBridge();
         if (sdb == null)
             return null;
@@ -115,9 +119,12 @@ final class Device implements IDevice {
             return null;
 
         String sdbShellCmd = sdbPath + " -s " + mSerialNumber + " shell";
+        if (!prompt)
+            sdbShellCmd += " " + command;
         Process pSdb = Runtime.getRuntime().exec(sdbShellCmd);
-        sdbShellProcess = new SdbShellProcess(pSdb, command);
-        return sdbShellProcess;
+        if (!prompt)
+            return pSdb;
+        return new SdbShellProcess(pSdb, command);
     }
 
     public void executeShellCommand(String command, IShellOutputReceiver receiver) throws TimeoutException,

diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/IDevice.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/IDevice.java
index 5c77443..f92ac16 100755 (executable)
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/IDevice.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/IDevice.java
@@ -136,7 +136,7 @@ public interface IDevice {
     FileListingService getFileListingService();
 
     /**
-     * Executes a shell command on the device and return SdbShellProcess
+     * Executes a shell command on the device interactively and return SdbShellProcess
      *
      * @param command the shell command to execute
      * @throws IOException in case of I/O error on the connection.
@@ -146,6 +146,15 @@ public interface IDevice {
     SdbShellProcess executeShellCommand(String command) throws IOException;
 
     /**
+     * Executes a shell command to the device promptly and return SdbShellProcess
+     *
+     * @param command the shell command to execute
+     * @throws IOException in case of I/O error on the connection.
+     *
+     * @see SdbShellProcess
+     */
+    public Process executeShellCommand(String command, boolean prompt) throws IOException;
+    /**
      * Executes a shell command on the device, and sends the result to a <var>receiver</var>
      * <p/>This is similar to calling
      * <code>executeShellCommand(command, receiver, SdbPreferences.getTimeOut())</code>.