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

This commit is contained in:
Yuri Lin
2022-10-18 21:06:37 +00:00
committed by Android (Google) Code Review

View File

@@ -125,7 +125,7 @@ public final class AutomaticZenRule implements Parcelable {
name = getTrimmedString(source.readString()); name = getTrimmedString(source.readString());
} }
interruptionFilter = source.readInt(); interruptionFilter = source.readInt();
conditionId = source.readParcelable(null); conditionId = getTrimmedUri(source.readParcelable(null));
owner = getTrimmedComponentName(source.readParcelable(null)); owner = getTrimmedComponentName(source.readParcelable(null));
configurationActivity = getTrimmedComponentName(source.readParcelable(null)); configurationActivity = getTrimmedComponentName(source.readParcelable(null));
creationTime = source.readLong(); creationTime = source.readLong();