Merge pull request #618 from hasuniea/master

resolved #616

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java

@@ -487,15 +487,17 @@ public class AndroidAPIUtils {
         for (JsonElement element : jsonArray) {
             //  if (((JsonObject) element).entrySet().iterator().next().getValue().getAsString().equalsIgnoreCase(needed));
             for (Map.Entry<String, JsonElement> ob : ((JsonObject) element).entrySet()) {
+                JsonElement val = ob.getValue();
+                if (val != null && !val.isJsonNull()) {
                     if (exist) {
-                    return ob.getValue().getAsString().replace("%", "");
+                        return val.getAsString().replace("%", "");
                     }
-                JsonElement val = ob.getValue();
+                    if (val.getAsString().equalsIgnoreCase(needed)) {
-                if (val != null && !val.isJsonNull() && ob.getValue().getAsString().equalsIgnoreCase(needed)) {
                         exist = true;
                     }
                 }
             }
+        }
         return "";
     }