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

Commit 38989c9c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev

parents 297028ea 5e3d75a6
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -15,18 +15,17 @@
 */
package com.android.settings.wifi.p2p;

import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.location.LocationManager;
import android.net.wifi.WifiManager;

import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;

import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -70,6 +69,9 @@ public class WifiP2pPreferenceController extends AbstractPreferenceController
        super.displayPreference(screen);
        mWifiDirectPref = screen.findPreference(KEY_WIFI_DIRECT);
        togglePreferences();
        if (!mIsWifiDirectAllow) {
            mWifiDirectPref.setSummary(R.string.not_allowed_by_ent);
        }
    }

    @Override
+2 −2
Original line number Diff line number Diff line
@@ -22,12 +22,10 @@ import static com.google.common.truth.Truth.assertThat;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -40,6 +38,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;

import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;

import org.junit.Before;
@@ -142,6 +141,7 @@ public class WifiP2PPreferenceControllerTest {
        mController.displayPreference(mScreen);

        verify(mWifiDirectPreference).setEnabled(false);
        verify(mWifiDirectPreference).setSummary(R.string.not_allowed_by_ent);
    }

    @Test