From 1a0f54af271a116d5f3556e644c360dd279e15c4 Mon Sep 17 00:00:00 2001 From: Darrell Shi Date: Fri, 3 Dec 2021 00:09:33 +0000 Subject: [PATCH] Temporarily disable trusted network condition. Currently the key stored in settings doesn't match the key being checked for trusted network. A fix CL ag/16338602 is pending, but until it is merged, the condition will be temporarily disabled to lift the broken behavior. Test: manual Bug: 202778351 Fix: 208740442 Change-Id: I3c534984295a3d10264badf61926e1455235d692 --- .../android/systemui/communal/dagger/CommunalModule.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.java b/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.java index 3ebfb513dfc5a..9b72655c9fb5b 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.java +++ b/packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.java @@ -22,12 +22,11 @@ import android.widget.FrameLayout; import com.android.systemui.communal.conditions.CommunalCondition; import com.android.systemui.communal.conditions.CommunalSettingCondition; -import com.android.systemui.communal.conditions.CommunalTrustedNetworkCondition; import com.android.systemui.idle.AmbientLightModeMonitor; import com.android.systemui.idle.LightSensorEventsDebounceAlgorithm; import com.android.systemui.idle.dagger.IdleViewComponent; -import java.util.Arrays; +import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -73,9 +72,7 @@ public interface CommunalModule { @ElementsIntoSet @Named(COMMUNAL_CONDITIONS) static Set provideCommunalConditions( - CommunalSettingCondition communalSettingCondition, - CommunalTrustedNetworkCondition communalTrustedNetworkCondition) { - return new HashSet<>( - Arrays.asList(communalSettingCondition, communalTrustedNetworkCondition)); + CommunalSettingCondition communalSettingCondition) { + return new HashSet<>(Collections.singletonList(communalSettingCondition)); } }