Merge pull request #317 from charithag/carbon-kernel-4.4.3

Fix for possible NPE that could happen due to null device or null pro…
revert-dabc3590
Chatura Dilan 8 years ago committed by GitHub
commit 76f14c13ab

@ -73,9 +73,11 @@ public class MobileDeviceManagementUtil {
} }
private static String getPropertyValue(Device device, String property) { private static String getPropertyValue(Device device, String property) {
for (Device.Property prop : device.getProperties()) { if (device != null && device.getProperties() != null) {
if (property.equals(prop.getName())) { for (Device.Property prop : device.getProperties()) {
return prop.getValue(); if (property.equals(prop.getName())) {
return prop.getValue();
}
} }
} }
return null; return null;

Loading…
Cancel
Save