diff options
| author | Yuri Lin <yurilin@google.com> | 2022-10-12 14:27:46 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-11 21:36:31 +0000 |
| commit | 303304af2eb0c4dfc10f650e171c1d405fbc849f (patch) | |
| tree | 696798eaeb8d0f6935173efdea978a35ae17e0b9 | |
| parent | b623d7107a28495a3641d783f21bb95e0adc1bf6 (diff) | |
| download | base-303304af2eb0c4dfc10f650e171c1d405fbc849f.tar.gz | |
[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
(cherry picked from commit 4ed0f171be9c4dcc4b8ad3157fcb522ecca36a9e)
Merged-In: Iae423d93b777df8946ecf1c3baf640fcf74990ec
| -rw-r--r-- | core/java/android/app/AutomaticZenRule.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/AutomaticZenRule.java b/core/java/android/app/AutomaticZenRule.java index 27a9a27e59a2..2573d9857671 100644 --- 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(); |