Fix manual rule on upgrade to modes_ui if DND was on
If the manual rule is present in the XML, we don't do any of the stuff to make the manual rule set up like a proper rule, with a non-null zenPolicy, etc, but that's incorrect if the manual rule only existed prior to
Also does not restore the manual rule condition when restoring from a backup, which matches previous behavior.
Fixes: 357161279
Test: ZenModeHelperTest, ZenModeConfigTest, manual by turning modes_ui off and then on both with DND on and DND on for a duration
Flag: android.app.modes_ui
Change-Id: I12e9d1713313aa0a3b626e79c66525b3db21056f
4 files changed