diff options
9 files changed, 10 insertions, 31 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/BooleanPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/BooleanPolicySerializer.java index 950ec77f5ba8..502607be7310 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/BooleanPolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/BooleanPolicySerializer.java @@ -19,7 +19,6 @@ package com.android.server.devicepolicy; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.admin.BooleanPolicyValue; -import android.app.admin.PolicyKey; import android.util.Log; import com.android.modules.utils.TypedXmlPullParser; @@ -37,8 +36,7 @@ final class BooleanPolicySerializer extends PolicySerializer<Boolean> { private static final String TAG = "BooleanPolicySerializer"; @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, @NonNull Boolean value) - throws IOException { + void saveToXml(TypedXmlSerializer serializer, @NonNull Boolean value) throws IOException { Objects.requireNonNull(value); serializer.attributeBoolean(/* namespace= */ null, ATTR_VALUE, value); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/BundlePolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/BundlePolicySerializer.java index d24afabe95a4..a65c7e1870f3 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/BundlePolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/BundlePolicySerializer.java @@ -18,8 +18,6 @@ package com.android.server.devicepolicy; import android.annotation.NonNull; import android.app.admin.BundlePolicyValue; -import android.app.admin.PackagePolicyKey; -import android.app.admin.PolicyKey; import android.os.Bundle; import android.os.Parcelable; import android.util.Log; @@ -53,14 +51,8 @@ final class BundlePolicySerializer extends PolicySerializer<Bundle> { private static final String ATTR_TYPE_BUNDLE_ARRAY = "BA"; @Override - void saveToXml(@NonNull PolicyKey policyKey, TypedXmlSerializer serializer, - @NonNull Bundle value) throws IOException { + void saveToXml(TypedXmlSerializer serializer, @NonNull Bundle value) throws IOException { Objects.requireNonNull(value); - Objects.requireNonNull(policyKey); - if (!(policyKey instanceof PackagePolicyKey)) { - throw new IllegalArgumentException("policyKey is not of type " - + "PackagePolicyKey"); - } writeBundle(value, serializer); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/ComponentNamePolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/ComponentNamePolicySerializer.java index 6303a1a8b860..01f56e07e157 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/ComponentNamePolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/ComponentNamePolicySerializer.java @@ -19,7 +19,6 @@ package com.android.server.devicepolicy; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.admin.ComponentNamePolicyValue; -import android.app.admin.PolicyKey; import android.content.ComponentName; import android.util.Log; @@ -37,8 +36,7 @@ final class ComponentNamePolicySerializer extends PolicySerializer<ComponentName private static final String ATTR_CLASS_NAME = "class-name"; @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, - @NonNull ComponentName value) throws IOException { + void saveToXml(TypedXmlSerializer serializer, @NonNull ComponentName value) throws IOException { Objects.requireNonNull(value); serializer.attribute( /* namespace= */ null, ATTR_PACKAGE_NAME, value.getPackageName()); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/IntegerPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/IntegerPolicySerializer.java index 45a2d2a7bda1..ebbf22cfef69 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/IntegerPolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/IntegerPolicySerializer.java @@ -19,7 +19,6 @@ package com.android.server.devicepolicy; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.admin.IntegerPolicyValue; -import android.app.admin.PolicyKey; import android.util.Log; import com.android.modules.utils.TypedXmlPullParser; @@ -37,8 +36,7 @@ final class IntegerPolicySerializer extends PolicySerializer<Integer> { private static final String ATTR_VALUE = "value"; @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, - @NonNull Integer value) throws IOException { + void saveToXml(TypedXmlSerializer serializer, @NonNull Integer value) throws IOException { Objects.requireNonNull(value); serializer.attributeInt(/* namespace= */ null, ATTR_VALUE, value); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/LockTaskPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/LockTaskPolicySerializer.java index 20bd2d75f846..13412d05aba3 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/LockTaskPolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/LockTaskPolicySerializer.java @@ -18,7 +18,6 @@ package com.android.server.devicepolicy; import android.annotation.NonNull; import android.app.admin.LockTaskPolicy; -import android.app.admin.PolicyKey; import android.util.Log; import com.android.modules.utils.TypedXmlPullParser; @@ -39,8 +38,8 @@ final class LockTaskPolicySerializer extends PolicySerializer<LockTaskPolicy> { private static final String ATTR_FLAGS = "flags"; @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, - @NonNull LockTaskPolicy value) throws IOException { + void saveToXml(TypedXmlSerializer serializer, @NonNull LockTaskPolicy value) + throws IOException { Objects.requireNonNull(value); serializer.attribute( /* namespace= */ null, diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/LongPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/LongPolicySerializer.java index 522c4b5e84be..c363e6626de3 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/LongPolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/LongPolicySerializer.java @@ -19,7 +19,6 @@ package com.android.server.devicepolicy; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.admin.LongPolicyValue; -import android.app.admin.PolicyKey; import android.util.Log; import com.android.modules.utils.TypedXmlPullParser; @@ -37,8 +36,7 @@ final class LongPolicySerializer extends PolicySerializer<Long> { private static final String ATTR_VALUE = "value"; @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, - @NonNull Long value) throws IOException { + void saveToXml(TypedXmlSerializer serializer, @NonNull Long value) throws IOException { Objects.requireNonNull(value); serializer.attributeLong(/* namespace= */ null, ATTR_VALUE, value); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java index 7a9fa0fb5658..9a73d5e76082 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java @@ -684,7 +684,7 @@ final class PolicyDefinition<V> { void savePolicyValueToXml(TypedXmlSerializer serializer, V value) throws IOException { - mPolicySerializer.saveToXml(mPolicyKey, serializer, value); + mPolicySerializer.saveToXml(serializer, value); } @Nullable diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicySerializer.java index 5af2fa285483..e83b031fd3c0 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicySerializer.java @@ -17,7 +17,6 @@ package com.android.server.devicepolicy; import android.annotation.NonNull; -import android.app.admin.PolicyKey; import android.app.admin.PolicyValue; import com.android.modules.utils.TypedXmlPullParser; @@ -26,7 +25,6 @@ import com.android.modules.utils.TypedXmlSerializer; import java.io.IOException; abstract class PolicySerializer<V> { - abstract void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, @NonNull V value) - throws IOException; + abstract void saveToXml(TypedXmlSerializer serializer, @NonNull V value) throws IOException; abstract PolicyValue<V> readFromXml(TypedXmlPullParser parser); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java index 0265453eecc7..a9d65ac5c7d4 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java @@ -18,7 +18,6 @@ package com.android.server.devicepolicy; import android.annotation.NonNull; import android.annotation.Nullable; -import android.app.admin.PolicyKey; import android.app.admin.PolicyValue; import android.app.admin.StringSetPolicyValue; import android.util.Log; @@ -35,8 +34,7 @@ final class StringSetPolicySerializer extends PolicySerializer<Set<String>> { private static final String ATTR_VALUES = "strings"; private static final String ATTR_VALUES_SEPARATOR = ";"; @Override - void saveToXml(PolicyKey policyKey, TypedXmlSerializer serializer, - @NonNull Set<String> value) throws IOException { + void saveToXml(TypedXmlSerializer serializer, @NonNull Set<String> value) throws IOException { Objects.requireNonNull(value); serializer.attribute( /* namespace= */ null, ATTR_VALUES, String.join(ATTR_VALUES_SEPARATOR, value)); |