Merge pull request #813 from sameeragunarathne/master

fixes https://github.com/wso2/product-iots/issues/1346

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js

@@ -302,8 +302,8 @@ var InitiateViewOption = null;
 
                             var viewModel = {};
                             viewModel["applications"] = data;
-                            viewModel["deviceType"] = deviceType;
                             viewModel["deviceId"] = deviceId;
+                            viewModel["deviceType"] = deviceType;
                             viewModel["appContext"] = context;
                             var content = template(viewModel);
                             $("#applications-list-container").html(content);

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs

@@ -15,7 +15,7 @@
     </p>
     <div class="actions">
         <div class="action-btn ripple">
-            <p><a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}">
+            <p><a href="{{appContext}}/devicemgt/policy/effective-policy?type={{deviceType}}&id={{deviceId}}">
               <i class="icon fw fw-view fw-2x"></i> <span>View Policy </span></a></p>
         </div>
     </div>