Add NotSupported status for synchronization with 3.0

Change-Id: Ibc8b55a135b25b74c75c4506a8129b732d299848
Signed-off-by: seolheui, kim <s414.kim@samsung.com>

diff --git a/lib/ode/common.h b/lib/ode/common.h
index b84a848..5f23338 100644 (file)
--- a/lib/ode/common.h
+++ b/lib/ode/common.h
@@ -68,9 +68,10 @@ typedef enum {
  * @since_tizen 4.0
  */
 typedef enum {
-    ODE_STATE_UNENCRYPTED   = 0x00, /**< Device is not encrypted */
-    ODE_STATE_ENCRYPTED     = 0x01, /**< Device is encrypted  */
-    ODE_STATE_CORRUPTED     = 0x02, /**< Device is corrupted because of encryption error */
+    ODE_STATE_NOT_SUPPORTED = -1,
+    ODE_STATE_UNENCRYPTED   = 0, /**< Device is not encrypted */
+    ODE_STATE_ENCRYPTED     = 1, /**< Device is encrypted  */
+    ODE_STATE_CORRUPTED     = 2, /**< Device is corrupted because of encryption error */
 } ode_state_e;
 
 /**

diff --git a/rmi/external-encryption.h b/rmi/external-encryption.h
index b944090..cc904c9 100644 (file)
--- a/rmi/external-encryption.h
+++ b/rmi/external-encryption.h
@@ -47,10 +47,10 @@ public:
        virtual int verifyPassword(const std::string& password) = 0;
 
        enum State {
-               Unencrypted = 0x00,
-               Encrypted   = 0x01,
-               Corrupted   = 0x02,
-               Invalid     = 0x03,
+               NotSupported = -1,
+               Unencrypted  = 0,
+               Encrypted    = 1,
+               Corrupted    = 2,
        };
 
        virtual int getState() = 0;

diff --git a/rmi/internal-encryption.h b/rmi/internal-encryption.h
index b7983ba..a38e25a 100644 (file)
--- a/rmi/internal-encryption.h
+++ b/rmi/internal-encryption.h
@@ -48,10 +48,10 @@ public:
        virtual int verifyPassword(const std::string& password) = 0;
 
        enum State {
-               Unencrypted = 0x00,
-               Encrypted   = 0x01,
-               Corrupted   = 0x02,
-               Invalid     = 0x03,
+               NotSupported = -1,
+               Unencrypted  = 0,
+               Encrypted    = 1,
+               Corrupted    = 2,
        };
 
        virtual int getState() = 0;

diff --git a/server/external-encryption.cpp b/server/external-encryption.cpp
index e2e230e..8ee102b 100644 (file)
--- a/server/external-encryption.cpp
+++ b/server/external-encryption.cpp
@@ -430,7 +430,7 @@ int ExternalEncryptionServer::getState()
        else if (valueStr == "error_partially_encrypted" || valueStr == "error_partially_decrypted")
                return State::Corrupted;
 
-       return State::Invalid;
+       return State::NotSupported;
 }
 
 unsigned int ExternalEncryptionServer::getSupportedOptions()

diff --git a/server/internal-encryption.cpp b/server/internal-encryption.cpp
index 0e1cad2..9c953c2 100644 (file)
--- a/server/internal-encryption.cpp
+++ b/server/internal-encryption.cpp
@@ -689,7 +689,7 @@ int InternalEncryptionServer::getState()
        else if (valueStr == "error_partially_encrypted" || valueStr == "error_partially_decrypted")
                return State::Corrupted;
 
-       return State::Invalid;
+       return State::NotSupported;
 }
 
 unsigned int InternalEncryptionServer::getSupportedOptions()