Updated android ResourceProperty to follow the same order as specified in octypes.h.

This fixes IOT-579.
Made a small correction in android build instructions

Change-Id: I5b2df5986ac8d0a75d9a987d8667f942a24ec2cf
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1420
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

diff --git a/android/BuildInstructionsForAndroidAPI.txt b/android/BuildInstructionsForAndroidAPI.txt
index 8dda6db..4bc0515 100644 (file)
--- a/android/BuildInstructionsForAndroidAPI.txt
+++ b/android/BuildInstructionsForAndroidAPI.txt
@@ -26,7 +26,7 @@ TO RUN UNIT TESTS IN ANDROID-API
 \r
 TO USE THE .AAR FILE IN <iotivity>/android/examples project\r
 \r
-6. Verify that 9 different *.so files exist inside <iotivity>/android/android-api/base/libs/<TARGET_ARCH> directory. (They should already be present in the *.aar file.)\r
+6. Verify that 7 different *.so files exist inside <iotivity>/android/android-api/base/libs/<TARGET_ARCH> directory. (They should already be present in the *.aar file.)\r
 7. Import Project 'Examples' into android-studio.\r
 8.To add an .aar file to the 'Examples' project,\r
    a.Right click on Examples->New->Module->Import .JAR or .AAR Package\r
@@ -39,7 +39,7 @@ TO USE THE .AAR FILE IN <iotivity>/android/examples project
 \r
 TO USE THE .AAR FILE IN A DIFFERENT PROJECT\r
 \r
-9. Verify that 9 different *.so files exist inside <iotivity base>/android/android-api/base/libs/<TARGET_ARCH> directory.\r
+9. Verify that 7 different *.so files exist inside <iotivity base>/android/android-api/base/libs/<TARGET_ARCH> directory.\r
 10. Import the .aar file in your project to use it\r
 \r
 \r

diff --git a/android/android_api/base/src/main/java/org/iotivity/base/ResourceProperty.java b/android/android_api/base/src/main/java/org/iotivity/base/ResourceProperty.java
index 64345db..778543d 100644 (file)
--- a/android/android_api/base/src/main/java/org/iotivity/base/ResourceProperty.java
+++ b/android/android_api/base/src/main/java/org/iotivity/base/ResourceProperty.java
@@ -23,9 +23,9 @@
 package org.iotivity.base;\r
 \r
 public enum ResourceProperty {\r
-    ACTIVE(1 << 0),\r
-    DISCOVERABLE(1 << 1),\r
-    OBSERVABLE(1 << 2),\r
+    DISCOVERABLE(1 << 0),\r
+    OBSERVABLE(1 << 1),\r
+    ACTIVE(1 << 2),\r
     SLOW(1 << 3),\r
     SECURE(1 << 4);\r
 \r