mirror of
https://github.com/yurisieucuti/treble_evolution.git
synced 2024-11-24 12:06:19 +00:00
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
From 55b8d29dfbdced39963226cfd29e78ace726493a Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Scott <scottjonathan@google.com>
|
|
Date: Wed, 19 Jul 2023 11:10:44 +0000
|
|
Subject: [PATCH 47/56] Replace ":strings" with "strings"
|
|
|
|
It looks like this is a typo and can cause parse errors with some xml
|
|
deserialization libraries.
|
|
|
|
Test: manual - set User Control Disabled Packages - restart device -
|
|
confirm that policy is still set
|
|
Bug: 291711966
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4905c30a74d2037aef7e8e91912b08c4897e7dd5)
|
|
Merged-In: Ib8eb2356ece3d9f0e85b7b8c455e58106a1d84f1
|
|
Change-Id: Ib8eb2356ece3d9f0e85b7b8c455e58106a1d84f1
|
|
---
|
|
.../android/server/devicepolicy/StringSetPolicySerializer.java | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java b/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java
|
|
index 24d0521471f7..0265453eecc7 100644
|
|
--- a/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java
|
|
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/StringSetPolicySerializer.java
|
|
@@ -32,9 +32,8 @@ import java.util.Set;
|
|
|
|
// TODO(scottjonathan): Replace with generic set implementation
|
|
final class StringSetPolicySerializer extends PolicySerializer<Set<String>> {
|
|
- private static final String ATTR_VALUES = ":strings";
|
|
+ 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 {
|
|
--
|
|
2.25.1
|
|
|