Merge branch 'master' into 'master'

Allow suspended status to update the device status

See merge request entgra/carbon-device-mgt!649
revert-70ac1926
Charitha Goonetilleke 4 years ago
commit 542fea8992

@ -2744,11 +2744,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
return false; //New status is similar to current
}
int tenantId = this.getTenantId();
switch (newStatus) {
case ACTIVE:
isDeviceUpdated = updateEnrollment(deviceId, enrolmentInfo, tenantId);
break;
case INACTIVE:
if (EnrolmentInfo.Status.REMOVED == newStatus) {
isDeviceUpdated = disenrollDevice(deviceIdentifier);
} else {
enrolmentInfo = device.getEnrolmentInfo();
if (enrolmentInfo.getStatus() != newStatus) {
enrolmentInfo.setStatus(newStatus);
@ -2756,12 +2754,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
} else {
isDeviceUpdated = false;
}
break;
case REMOVED:
isDeviceUpdated = disenrollDevice(deviceIdentifier);
break;
default:
throw new DeviceManagementException("Invalid status retrieved. Status : " + newStatus);
}
return isDeviceUpdated;
}

Loading…
Cancel
Save