Merge remote-tracking branch 'origin/tizen' into da-file

Change-Id: I59ce25fbcbffecfdaa2658daebe3f815d5190e33
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DALimit.java
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
index af67f9d,45c3ef7..2f9a94a
--- 1/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
--- 2/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
@@@ -385,44 -346,17 +347,38 @@@ public class DACommunicator 
  
                return processMap;
        }
 +      
 +      public static String getProcessNameFromTarget(int pid) {
 +              if (null == GlobalInformation.getCurrentDeviceInfo()) {
 +                      return null;
 +              }
 +              String processName = null;
 +              cmdResultMultiLines.clear();
 +              String command = String.format( AnalyzerShellCommands.CMD_PROCESS_NAME, pid );
 +              // get process name from target
 +              CommunicatorUtils.execShellCommand(command,
 +                              new MultiLineReceiver() {
 +                                      @Override
 +                                      public void processNewLines(String[] appLines) {
 +                                              for (int i = 0; i < appLines.length; i++) {
 +                                                      cmdResultMultiLines.add(appLines[i]);
 +                                              }
 +                                      }
 +                              });
 +              processName = cmdResultMultiLines.get(1);
 +              return processName;
 +      }
  
-       private static boolean isUnittest(String pkgId) {
-               if (null != unittestList && !unittestList.isEmpty()) {
-                       for (String id : unittestList) {
-                               if (id.equals(pkgId)) {
-                                       return true;
-                               }
-                       }
-               }
-               return false;
-       }
+       public static PackageInfo getPkgInfoByLabel(String appLabel) {
+               DeviceInfo curDev = GlobalInformation.getCurrentDeviceInfo();
+               if (null != curDev) {
+                       Map<String, PackageInfo> pkgHash = curDev.getPackageInfoHash();
  
-       private static boolean isIME(String appId) {
-               if (null != imeList && !imeList.isEmpty()) {
-                       for (String id : imeList) {
-                               if (id.equals(appId)) {
-                                       return true;
+                       for (Map.Entry<String, PackageInfo> entry : pkgHash.entrySet()) {
+                               AppInfo app = entry.getValue().getMainApp();
+                               String label = app.getInfo(AppInfo.PROPERTY.LABEL.index);
+                               if (appLabel.equals(label)) {
+                                       return entry.getValue();
                                }
                        }
                }

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/DataChannelConstants.java
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/FileData.java
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/Formatter.java
Simple merge