From 7d060851fcb6ef1cc4fd138e8f09cd95664dca30 Mon Sep 17 00:00:00 2001
From: Rahul Rahul <rahul.rahul@intel.com>
Date: Wed, 24 Jun 2015 13:47:21 -0700
Subject: [PATCH] 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>
---
 android/BuildInstructionsForAndroidAPI.txt                          | 4 ++--
 .../base/src/main/java/org/iotivity/base/ResourceProperty.java      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/BuildInstructionsForAndroidAPI.txt b/android/BuildInstructionsForAndroidAPI.txt
index 8dda6db..4bc0515 100644
--- a/android/BuildInstructionsForAndroidAPI.txt
+++ b/android/BuildInstructionsForAndroidAPI.txt
@@ -26,7 +26,7 @@ TO RUN UNIT TESTS IN ANDROID-API
 
 TO USE THE .AAR FILE IN <iotivity>/android/examples project
 
-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.)
+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.)
 7. Import Project 'Examples' into android-studio.
 8.To add an .aar file to the 'Examples' project,
    a.Right click on Examples->New->Module->Import .JAR or .AAR Package
@@ -39,7 +39,7 @@ TO USE THE .AAR FILE IN <iotivity>/android/examples project
 
 TO USE THE .AAR FILE IN A DIFFERENT PROJECT
 
-9. Verify that 9 different *.so files exist inside <iotivity base>/android/android-api/base/libs/<TARGET_ARCH> directory.
+9. Verify that 7 different *.so files exist inside <iotivity base>/android/android-api/base/libs/<TARGET_ARCH> directory.
 10. Import the .aar file in your project to use it
 
 
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
--- 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;
 
 public enum ResourceProperty {
-    ACTIVE(1 << 0),
-    DISCOVERABLE(1 << 1),
-    OBSERVABLE(1 << 2),
+    DISCOVERABLE(1 << 0),
+    OBSERVABLE(1 << 1),
+    ACTIVE(1 << 2),
     SLOW(1 << 3),
     SECURE(1 << 4);
 
-- 
2.7.4