From: hyeran74.kim <hyeran74.kim@samsung.com>
Date: Thu, 25 Sep 2014 06:34:17 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/tizen' into da-file
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dda6ea2035c942cbea4a40118dd9e2db05745966;p=sdk%2Ftools%2Fdynamic-analyzer.git

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

Conflicts:
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogCenterConstants.java

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

dda6ea2035c942cbea4a40118dd9e2db05745966
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogCenterConstants.java
index 276d77e,e770d4e..b9be2b1
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogCenterConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogCenterConstants.java
@@@ -126,11 -51,10 +51,11 @@@ public class LogCenterConstants 
  	public static final int FD_API_TYPE_OTHERS = 8;
  	public static final int FD_API_TYPE_LOCK_START = 14;
  	public static final int FD_API_TYPE_LOCK_END = 15;
 -	public static final int FD_API_TYPE_LOCK_WAIT_START = 16;
 -	public static final int FD_API_TYPE_LOCK_WAIT_END = 17;		
 +	public static final int FD_API_TYPE_UNLOCK = 16;
 +	public static final int FD_API_TYPE_LOCK_WAIT_START = 17;
 +	public static final int FD_API_TYPE_LOCK_WAIT_END = 18;		
- 	
- 	/* Log Network */
+ 
+ 	/* network api type */
  	public static final int SOCKET_API_FD_OPEN = 0;
  	public static final int SOCKET_API_FD_CLOSE = 1;
  	public static final int SOCKET_API_RECV_START = 2;
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java
index 1b2ee46,91956b3..a6d0563
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java
@@@ -28,8 -28,8 +28,7 @@@ package org.tizen.dynamicanalyzer.ui.fi
  
  
  import java.util.ArrayList;
- 
  import java.util.HashMap;
 -import java.util.HashSet;
  import java.util.List;
  import java.util.Map;
  import java.util.Queue;
@@@ -38,9 -38,9 +37,10 @@@ import java.util.concurrent.ConcurrentL
  import org.eclipse.swt.SWT;
  import org.eclipse.swt.widgets.Display;
  import org.eclipse.swt.widgets.Shell;
 +import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
  import org.tizen.dynamicanalyzer.common.AnalyzerManager;
  import org.tizen.dynamicanalyzer.common.DALimit;
+ import org.tizen.dynamicanalyzer.common.Global;
  import org.tizen.dynamicanalyzer.common.path.PathManager;
  import org.tizen.dynamicanalyzer.constant.CommonConstants;
  import org.tizen.dynamicanalyzer.logparser.LogCenterConstants;