Modify setting app type

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/SubscriptionManagerImpl.java

@@ -459,9 +459,10 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
 
             //todo rethink and modify the {@link MobileApp} usage
             MobileApp mobileApp = new MobileApp();
+            MobileAppTypes mobileAppType = MobileAppTypes.valueOf(application.getType());
             if (DeviceTypes.ANDROID.toString().equalsIgnoreCase(deviceType)) {
                 if (SubAction.INSTALL.toString().equalsIgnoreCase(action)) {
-                    mobileApp.setType(MobileAppTypes.ENTERPRISE);
+                    mobileApp.setType(mobileAppType);
                     mobileApp.setLocation(application.getApplicationReleases().get(0).getInstallerPath());
                     return MDMAndroidOperationUtil.createInstallAppOperation(mobileApp);
                 } else if (SubAction.UNINSTALL.toString().equalsIgnoreCase(action)) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/MDMAndroidOperationUtil.java

@@ -48,12 +48,9 @@ public class MDMAndroidOperationUtil {
 
 		switch (application.getType()) {
 			case ENTERPRISE:
-				EnterpriseApplication enterpriseApplication =
+				EnterpriseApplication enterpriseApplication = new EnterpriseApplication();
-						new EnterpriseApplication();
 				enterpriseApplication.setType(application.getType().toString());
-				//TODO: replace needs to be removed after doing the proper config update in application-mgt.xml
+				enterpriseApplication.setUrl(application.getLocation());
-				enterpriseApplication.setUrl(application.getLocation().replace("https://localhost:9443",
-				                                                               "http://192.168.8.6:9763"));
 				operation.setPayLoad(enterpriseApplication.toJSON());
 				break;
 			case PUBLIC: