commit 4ed0f171be9c4dcc4b8ad3157fcb522ecca36a9e
author Yuri Lin <yurilin@google.com> Wed Oct 12 14:27:46 2022 +0000
committer Yuri Lin <yurilin@google.com> Tue Oct 18 15:31:22 2022 +0000
tree 694485ad0fbcc2e3c48bb23a99712faad9d7f10e
parent bcca2354b046065e445645e460401f30d37ad87e

[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule

This change only applies to S branches and earlier.

Bug: 253085433
Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Test: AutomaticZenRuleTest
Change-Id: Iae423d93b777df8946ecf1c3baf640fcf74990ec
Merged-In: Iae423d93b777df8946ecf1c3baf640fcf74990ec

core/java/android/app/AutomaticZenRule.java

diff --git a/core/java/android/app/AutomaticZenRule.java b/core/java/android/app/AutomaticZenRule.java
index 27a9a27..2573d98 100644
--- a/core/java/android/app/AutomaticZenRule.java
+++ b/core/java/android/app/AutomaticZenRule.java
@@ -125,7 +125,7 @@
             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();