X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=android%2Fandroid_api%2Fbase%2Fjni%2FJniUtils.h;h=ebcec3d5ffadb49eff71e84b8639f3ad2c3c3459;hb=c315c87e07c4080ecd0ef488e7a1047bc3c509b2;hp=a7a259a4decb55044688095362d69c3154b3a8d8;hpb=9aa9b2a55b0ba2dc45ff1466bce419acfad515be;p=platform%2Fupstream%2Fiotivity.git

diff --git a/android/android_api/base/jni/JniUtils.h b/android/android_api/base/jni/JniUtils.h
index a7a259a..ebcec3d 100644
--- a/android/android_api/base/jni/JniUtils.h
+++ b/android/android_api/base/jni/JniUtils.h
@@ -133,6 +133,36 @@ public:
         };
     }
 
+    static OCTransportAdapter getOCTransportAdapter(int adapter)
+    {
+        int transport = OCTransportAdapter::OC_DEFAULT_ADAPTER;
+        if (adapter & CT_ADAPTER_IP)
+        {
+            transport |= OCTransportAdapter::OC_ADAPTER_IP;
+        }
+
+        if (adapter & CT_ADAPTER_GATT_BTLE)
+        {
+            transport |= OCTransportAdapter::OC_ADAPTER_GATT_BTLE;
+        }
+
+        if (adapter & CT_ADAPTER_RFCOMM_BTEDR)
+        {
+            transport |= OCTransportAdapter::OC_ADAPTER_RFCOMM_BTEDR;
+        }
+
+        if (adapter & CT_ADAPTER_TCP)
+        {
+            transport |= OCTransportAdapter::OC_ADAPTER_TCP;
+        }
+
+        if (adapter & CT_ADAPTER_NFC)
+        {
+            transport |= OCTransportAdapter::OC_ADAPTER_NFC;
+        }
+        return (OCTransportAdapter)transport;
+    }
+
     static std::string stackResultToStr(const int result)
     {
         switch (result)
@@ -144,6 +174,8 @@ public:
                 return "RESOURCE_CREATED";
             case OC_STACK_RESOURCE_DELETED:
                 return "RESOURCE_DELETED";
+            case OC_STACK_RESOURCE_CHANGED:
+                return "RESOURCE_CHANGED";
             case OC_STACK_CONTINUE:
                 return "CONTINUE";
             /* Error status code - START HERE */
@@ -205,6 +237,8 @@ public:
             case OC_STACK_INVALID_JSON:
                 return "INVALID_JSON";
             /** Request is not authorized by Resource Server. */
+            case OC_STACK_NOT_ACCEPTABLE:
+                return "NOT_ACCEPTABLE";
             case OC_STACK_UNAUTHORIZED_REQ:
                 return "UNAUTHORIZED_REQ";
             /** Error code from PDM */
@@ -214,6 +248,8 @@ public:
                 return "DUPLICATE_UUID";
             case OC_STACK_INCONSISTENT_DB:
                 return "INCONSISTENT_DB";
+            case OC_STACK_SVR_DB_NOT_EXIST:
+                return "SVR_DB_NOT_EXIST";
             /** Error code from OTM */
             case OC_STACK_AUTHENTICATION_FAILURE:
                 return "AUTHENTICATION_FAILURE";