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

Conflicts:
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLStateProgramDBTableManager.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java

Change-Id: I119b85750e7dee045e7235063334a4a07774d55b
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBConstants.java
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/GLES20LogData.java
index bcaa66c,e014e57..46fa9b3
--- 1/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/GLES20LogData.java
--- 2/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/GLES20LogData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/GLES20LogData.java
@@@ -29,9 -29,11 +29,11 @@@ public class GLES20LogData extends Prob
                byte[] temp = new byte[length];
                System.arraycopy(data, index, temp, 0, length);
                contextValue = new String(temp);
+               
+               return true;
        }
  
 -      public long getCurrentContextName() {
 +      public long getCurrentContextID() {
                return glCurrentContextName;
        }
  

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java
index 5ae2d48,008af7e..be0da2c
--- 1/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java
--- 2/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java
@@@ -111,18 -103,16 +111,16 @@@ public class GLDataManager extends Page
        }
  
        public void openProcess() {
 -              if (null != stateDataMaker) {
 +              if (null != stateDataManager) {
                        updateFrameTimeChartEndTimeAtOpen();
 -                      stateProgramDBTable.initProgramData();
 +                      stateProgramDBTable.initProgramDataAtOpen();
                }
- 
        }
  
        public void stopProcess() {
 -              if (null != stateDataMaker) {
 -                      stateProgramDBTable.insertData();
 +              if (null != stateDataManager) {
 +                      stateProgramDBTable.insertProgramData();
                }
- 
        }
        
        @Override