diff options
| author | kh5325.kim <kh5325.kim@samsung.com> | 2013-11-01 12:11:46 +0900 |
|---|---|---|
| committer | kh5325.kim <kh5325.kim@samsung.com> | 2013-11-01 12:11:46 +0900 |
| commit | 7cefd8b224d8983f1fe77eaa02c66a0c99b21326 (patch) | |
| tree | f47f93997cf35e1eb891453848bb8c449f61a4c6 | |
| parent | 70d0c4a5f2efe9a45a71167204a31bb9536c37aa (diff) | |
| download | common-eplugin-7cefd8b224d8983f1fe77eaa02c66a0c99b21326.tar.gz common-eplugin-7cefd8b224d8983f1fe77eaa02c66a0c99b21326.tar.bz2 common-eplugin-7cefd8b224d8983f1fe77eaa02c66a0c99b21326.zip | |
Upload tizen_2.2 source2.2.1_releasetizen_2.2
Change-Id: I13eb5ee05d1bec1682349ec9e5ebad3c588a35c5
| -rw-r--r-- | org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java | 4 | ||||
| -rw-r--r-- | org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java | 14 | ||||
| -rw-r--r-- | package/changelog | 3 | ||||
| -rw-r--r-- | package/pkginfo.manifest | 2 |
4 files changed, 21 insertions, 2 deletions
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 49a1715ad..a5ca841e4 100644 --- a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java +++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java @@ -249,6 +249,10 @@ implements IDevice { if ( null != root ) { + if(isEmulator() == true && root.getType() == FileEntryType.RootDevice) + { + root.setType(FileEntryType.RootEmulator); + } return root; } return root = new FileEntry(this, null, getDeviceName(), isEmulator()?FileEntryType.RootEmulator:FileEntryType.RootDevice, null, null, null, null, null, null, null, null ); diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java index 9816454d6..4333039cf 100644 --- a/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java +++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java @@ -106,7 +106,7 @@ implements Comparable<FileEntry> /**
* Type of file
*/
- protected final FileEntryType type;
+ protected FileEntryType type;
/**
* File permissions
@@ -222,6 +222,18 @@ implements Comparable<FileEntry> return type;
}
+
+ /**
+ * set type of entry
+ *
+ */
+ public
+ void
+ setType(FileEntryType type)
+ {
+ this.type = type;
+ }
+
/**
* Returns device to exist in
*
diff --git a/package/changelog b/package/changelog index 8274f839b..5dcfdf0d3 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 2.2.23 +- fixed a bug where root file entry type of device is not correctly recognized sometimes. +== shingil.kang <shingil.kang@samsung.com> 2013-10-31 18:29 * 2.2.22 - Fixed bug about memory error. - Fixed bug about pulling several files. diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 6ef6a3fcb..2299ce7f3 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version:2.2.22 +Version:2.2.23 Source:common-eplugin Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>, shingil kang <shingil.kang@samsung.com> |