Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into qt-dev

2022-10-18 21:06:37 +00:00
parent dc0095e9e4 303f6bde89
commit 600ecb01d0
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/AutomaticZenRule.java
+++ b/core/java/android/app/AutomaticZenRule.java
@@ -125,7 +125,7 @@ public final class AutomaticZenRule implements Parcelable {
            name = getTrimmedString(source.readString());
        }
        interruptionFilter = source.readInt();
-        conditionId = source.readParcelable(null);
+        conditionId = getTrimmedUri(source.readParcelable(null));
        owner = getTrimmedComponentName(source.readParcelable(null));
        configurationActivity = getTrimmedComponentName(source.readParcelable(null));
        creationTime = source.readLong();