From b5afa43c8ad8cd6fe15c159de24c97ba7a2eb0ab Mon Sep 17 00:00:00 2001 From: Maria Guseva Date: Wed, 26 Oct 2016 21:19:00 +0300 Subject: [PATCH] [RELEASE] 2.3.21 - Fix JIRA defects: SPTSDKUX-2442: Unable to Launch web app in target mobile device. SPTSDKUX-2452: Selected path from Heap allocation chart is not highlight the path under Statistics Change-Id: Ifcee4d80fbf5eb55491620e575f72093f333cb2b --- org.tizen.dynamicanalyzer.common.test/pom.xml | 2 +- org.tizen.dynamicanalyzer.test/pom.xml | 2 +- .../dynamicanalyzer.product | 2 +- org.tizen.dynamicanalyzer.workbench.product/pom.xml | 4 ++-- .../src/org/tizen/dynamicanalyzer/common/DAResult.java | 1 + .../src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.java | 2 ++ .../org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties | 1 + .../src/org/tizen/dynamicanalyzer/protocol/p30/Communicator30.java | 7 +++++-- .../dynamicanalyzer/ui/memory/HeapChartsSelectionListener.java | 4 ++-- package/changelog | 5 +++++ package/pkginfo.manifest | 2 +- pom.xml | 2 +- 12 files changed, 23 insertions(+), 11 deletions(-) diff --git a/org.tizen.dynamicanalyzer.common.test/pom.xml b/org.tizen.dynamicanalyzer.common.test/pom.xml index 7e1c24f..e8cc45f 100644 --- a/org.tizen.dynamicanalyzer.common.test/pom.xml +++ b/org.tizen.dynamicanalyzer.common.test/pom.xml @@ -6,7 +6,7 @@ dynamic-analyzer org.tizen.dynamicanalyzer - 2.3.20-SNAPSHOT + 2.3.21-SNAPSHOT .. org.tizen.dynamicanalyzer diff --git a/org.tizen.dynamicanalyzer.test/pom.xml b/org.tizen.dynamicanalyzer.test/pom.xml index c97d8d9..68cd396 100644 --- a/org.tizen.dynamicanalyzer.test/pom.xml +++ b/org.tizen.dynamicanalyzer.test/pom.xml @@ -6,7 +6,7 @@ dynamic-analyzer org.tizen.dynamicanalyzer - 2.3.20-SNAPSHOT + 2.3.21-SNAPSHOT .. org.tizen.dynamicanalyzer diff --git a/org.tizen.dynamicanalyzer.workbench.product/dynamicanalyzer.product b/org.tizen.dynamicanalyzer.workbench.product/dynamicanalyzer.product index e03ea1b..ee859bb 100644 --- a/org.tizen.dynamicanalyzer.workbench.product/dynamicanalyzer.product +++ b/org.tizen.dynamicanalyzer.workbench.product/dynamicanalyzer.product @@ -1,7 +1,7 @@ - + diff --git a/org.tizen.dynamicanalyzer.workbench.product/pom.xml b/org.tizen.dynamicanalyzer.workbench.product/pom.xml index ff5aa7b..391c44d 100644 --- a/org.tizen.dynamicanalyzer.workbench.product/pom.xml +++ b/org.tizen.dynamicanalyzer.workbench.product/pom.xml @@ -8,13 +8,13 @@ dynamic-analyzer org.tizen.dynamicanalyzer - 2.3.20-SNAPSHOT + 2.3.21-SNAPSHOT .. org.tizen.dynamicanalyzer org.tizen.dynamicanalyzer.workbench.product - 2.3.20-SNAPSHOT + 2.3.21-SNAPSHOT eclipse-repository diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java index 6402bee..3048e6c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java @@ -87,6 +87,7 @@ public class DAResult implements Serializable { ERR_WRONG_MESSAGE_FORMAT(-2011, UserErrorWarningLabels.ERR_WRONG_MESSAGE_FORMAT), ERR_DATA_SOCKET_CLOSED(-2012, UserErrorWarningLabels.ERROR_CONNECTION_CLOSED), ERR_DOWNLOAD_FILE_FAILED(-2013, UserErrorWarningLabels.ERROR_DOWNLOAD_FILE_FAILED), + ERR_DOWNLOAD_FILE_FAILED_DUETO_SECURITY(-2014, UserErrorWarningLabels.ERROR_DOWNLOAD_FILE_FAILED_DUETO_SECURITY), ERR_MSG_START_FAIL(-2101, UserErrorWarningLabels.ERROR_START_TRACE_FAILED), ERR_MSG_SEND_FAIL(-2102, UserErrorWarningLabels.ERR_MSG_SEND_FAIL), diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.java index 977c9ef..a52c225 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.java @@ -31,6 +31,7 @@ import org.eclipse.osgi.util.NLS; public class UserErrorWarningLabels extends NLS { private static final String BUNDLE_NAME = "org.tizen.dynamicanalyzer.nl.UserErrorWarningLabels"; //$NON-NLS-1$ + public static String ERROR_LIBTRACE_START; public static String ERROR_RPM_NOT_FOUND; public static String ERROR_LIB_NOT_FOUND_INRPM; @@ -52,6 +53,7 @@ public class UserErrorWarningLabels extends NLS { public static String ERROR_CONFIGURATION_FAILED; public static String ERROR_CONNECTION_CLOSED; public static String ERROR_DOWNLOAD_FILE_FAILED; + public static String ERROR_DOWNLOAD_FILE_FAILED_DUETO_SECURITY; public static String ERROR_FAILED_OPERATION; public static String ERROR_INTERNAL_REASON; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties index c84bc4e..8d4fe65 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties @@ -16,6 +16,7 @@ ERROR_UNSUPPORTED_APPLICATION=Invalid application. \nSelect another application ERROR_CONFIGURATION_FAILED=Configuration cannot be retrieved from the device. \nCheck the connection. ERROR_CONNECTION_CLOSED=Socket seems to be closed. \nReconnect the device. ERROR_DOWNLOAD_FILE_FAILED=Download failed. +ERROR_DOWNLOAD_FILE_FAILED_DUETO_SECURITY=Download failed due to security reason. \nEnable root mode on device to proceed. ERROR_FAILED_OPERATION=Binary information cannot be retrieved from the device. \nReconnect the device. ERROR_INTERNAL_REASON=Failed for an internal reason.\nTry again or restart the dynamic analyzer. ERROR_BY_UNKNOWN_REASON=Failed for some reason. diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p30/Communicator30.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p30/Communicator30.java index 5ca3af7..9b46134 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p30/Communicator30.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p30/Communicator30.java @@ -767,8 +767,11 @@ public class Communicator30 extends SubCommunicator { } else { Logger.warning("Failed to get " + from); //$NON-NLS-1$ DAResult ret = new DAResult(ErrorCode.ERR_DOWNLOAD_FILE_FAILED); - - ret.setDetailMessage(CommonConstants.OPEN_BRACKET + from + // If we are not in root mode - the reason is security + if (!curDev.getIDevice().isRoot()) { + ret = new DAResult(ErrorCode.ERR_DOWNLOAD_FILE_FAILED_DUETO_SECURITY); + } + ret.setDetailMessage(CommonConstants.OPEN_BRACKET + "Failed to download: " + from + CommonConstants.CLOSE_BRACKET); return ret; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/HeapChartsSelectionListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/HeapChartsSelectionListener.java index c799581..5724ec1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/HeapChartsSelectionListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/HeapChartsSelectionListener.java @@ -84,7 +84,7 @@ public class HeapChartsSelectionListener extends DAChartBoardSelectionListener { // Walk through every item checking its name for (GridItem gridItem : table.getItems()) { DATableDataFormat itemData = (DATableDataFormat) gridItem.getData(); - if (((String) itemData.getObject()).equals(name)) { + if (((String) itemData.getData().get(0)).equals(name)) { if (!CommonUtil.isNumeric(name)) { // Not PID entry: need to check its parent on PID @@ -96,7 +96,7 @@ public class HeapChartsSelectionListener extends DAChartBoardSelectionListener { // same library but from another process or from // 'Total' entry - if (!((String) parentData.getObject()).equals(Integer.toString(pid))) + if (!((String) parentData.getData().get(0)).equals(Integer.toString(pid))) continue; } else diff --git a/package/changelog b/package/changelog index 7a93fbf..4e9106e 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,8 @@ +* 2.3.21 +- Fix JIRA defects: + SPTSDKUX-2442: Unable to Launch web app in target mobile device. + SPTSDKUX-2452: Selected path from Heap allocation chart is not highlight the path under Statistics table. +== Maria Guseva October 26, 2016 * 2.3.20 - Improve Memory Range Analysis UX - Rename classes related to Persistent Allocations view diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 7b7da78..1fc0671 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Source:dynamic-analyzer -Version:2.3.20 +Version:2.3.21 Maintainer:Gihun Chang , WooJin Jung , Jaewon Lim , Seokgil Kang Package:dynamic-analyzer-product diff --git a/pom.xml b/pom.xml index ddd0e2f..722b597 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.tizen.dynamicanalyzer dynamic-analyzer - 2.3.20-SNAPSHOT + 2.3.21-SNAPSHOT pom -- 2.7.4