Merge "Moved zen-conversion-related methods into ZenAdapters" into main

This commit is contained in:
Matías Hernández
2024-03-05 16:52:03 +00:00
committed by Android (Google) Code Review

View File

@@ -30,6 +30,7 @@ import android.icu.text.MessageFormat;
import android.net.Uri; import android.net.Uri;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import android.provider.Settings; import android.provider.Settings;
import android.service.notification.ZenAdapters;
import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig;
import android.service.notification.ZenPolicy; import android.service.notification.ZenPolicy;
import android.util.Log; import android.util.Log;
@@ -399,14 +400,16 @@ public class ZenModeBackend {
ZenPolicy setDefaultZenPolicy(ZenPolicy zenPolicy) { ZenPolicy setDefaultZenPolicy(ZenPolicy zenPolicy) {
int calls; int calls;
if (mPolicy.allowCalls()) { if (mPolicy.allowCalls()) {
calls = ZenModeConfig.getZenPolicySenders(mPolicy.allowCallsFrom()); calls = ZenAdapters.notificationPolicySendersToZenPolicyPeopleType(
mPolicy.allowCallsFrom());
} else { } else {
calls = ZenPolicy.PEOPLE_TYPE_NONE; calls = ZenPolicy.PEOPLE_TYPE_NONE;
} }
int messages; int messages;
if (mPolicy.allowMessages()) { if (mPolicy.allowMessages()) {
messages = ZenModeConfig.getZenPolicySenders(mPolicy.allowMessagesFrom()); messages = ZenAdapters.notificationPolicySendersToZenPolicyPeopleType(
mPolicy.allowMessagesFrom());
} else { } else {
messages = ZenPolicy.PEOPLE_TYPE_NONE; messages = ZenPolicy.PEOPLE_TYPE_NONE;
} }