Merge branch 'master' into 'master'

Fix for enrollment app install without Google

See merge request entgra/carbon-device-mgt-plugins!121
This commit is contained in:
Inosh Perara 2019-12-05 07:53:27 +00:00
commit c70ef76728

View File

@ -711,7 +711,7 @@ public class AndroidDeviceUtils {
JsonElement googlePolicyPayload = appElement.getAsJsonObject().
get(AndroidConstants.ApplicationInstall.GOOGLE_POLICY_PAYLOAD);
if (googlePolicyPayload == null) {
if (googlePolicyPayload == null || googlePolicyPayload.toString().equals("\"\"")) {
uuid = appElement.getAsJsonObject().
get(AndroidConstants.ApplicationInstall.ENROLLMENT_APP_INSTALL_UUID).getAsString();
try (CloseableHttpClient httpClient = HttpClients.createDefault()) {