[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule

Yuri Lin · OhMyVenyx · commit 847c62675333 · 2023-01-19T16:43:16.000+07:00
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 (cherry picked from commit 7533d04) Merged-In: Iae423d93b777df8946ecf1c3baf640fcf74990ec
diff --git a/core/java/android/app/AutomaticZenRule.java b/core/java/android/app/AutomaticZenRule.java
@@ -125,7 +125,7 @@ public AutomaticZenRule(Parcel source) {
             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();

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public AutomaticZenRule(Parcel source) {`
`125`	`125`	`name = getTrimmedString(source.readString());`
`126`	`126`	`}`
`127`	`127`	`interruptionFilter = source.readInt();`
`128`		`- conditionId = source.readParcelable(null);`
	`128`	`+ conditionId = getTrimmedUri(source.readParcelable(null));`
`129`	`129`	`owner = getTrimmedComponentName(source.readParcelable(null));`
`130`	`130`	`configurationActivity = getTrimmedComponentName(source.readParcelable(null));`
`131`	`131`	`creationTime = source.readLong();`