Drop null policy value during reading from file (fa76627b) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/PolicyState.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -260,11 +260,14 @@ final class PolicyState<V> {
		break;
		}
		}
		if (admin != null) {
		if (admin != null && value != null) {
		policiesSetByAdmins.put(admin, value);
		} else {
		Slogf.wtf(TAG, "Error Parsing TAG_ADMIN_POLICY_ENTRY, EnforcingAdmin "
		+ "is null");
		Slogf.wtf(TAG, "Error Parsing TAG_ADMIN_POLICY_ENTRY for "
		+ (policyDefinition == null ? "unknown policy" : "policy with "
		+ "definition " + policyDefinition) + ", EnforcingAdmin is: "
		+ (admin == null ? "null" : admin) + ", value is : "
		+ (value == null ? "null" : value));
		}
		break;
		case TAG_POLICY_DEFINITION_ENTRY:
		@@ -283,7 +286,9 @@ final class PolicyState<V> {
		}
		currentResolvedPolicy = policyDefinition.readPolicyValueFromXml(parser);
		if (currentResolvedPolicy == null) {
		Slogf.wtf(TAG, "Error Parsing TAG_RESOLVED_VALUE_ENTRY, "
		Slogf.wtf(TAG, "Error Parsing TAG_RESOLVED_VALUE_ENTRY for "
		+ (policyDefinition == null ? "unknown policy" : "policy with "
		+ "definition " + policyDefinition) + ", "
		+ "currentResolvedPolicy is null");
		}
		break;