Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 949197ef authored by Darrell Shi's avatar Darrell Shi Committed by Android (Google) Code Review
Browse files

Merge "Temporarily disable trusted network condition."

parents 2389bc5b 1a0f54af

packages/SystemUI/src/com/android/systemui/communal/dagger/CommunalModule.java

+3 −6
Original line number Diff line number Diff line
@@ -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<CommunalCondition> provideCommunalConditions(

            CommunalSettingCondition communalSettingCondition,

            CommunalTrustedNetworkCondition communalTrustedNetworkCondition) {

        return new HashSet<>(

                Arrays.asList(communalSettingCondition, communalTrustedNetworkCondition));

            CommunalSettingCondition communalSettingCondition) {

        return new HashSet<>(Collections.singletonList(communalSettingCondition));

    }

}