PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: I5b0fbdb7f52f6570f273bc4510cd0fdecf2f7a63
This commit is contained in:
Zhen Zhang
2020-07-06 19:04:48 +00:00
committed by Automerger Merge Worker
parent 6417468179 05ae65b7b0
commit c570eb8c9a
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/AllInOneTetherPreferenceController.java
View File

@@ -37,6 +37,7 @@ import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Lifecycle.Event; import androidx.lifecycle.Lifecycle.Event;
import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
@@ -93,6 +94,12 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
} }
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(mPreferenceKey);
}
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (!TetherUtil.isTetherAvailable(mContext) if (!TetherUtil.isTetherAvailable(mContext)

16
tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
View File

@@ -24,6 +24,7 @@ import static com.android.settings.network.TetherEnabler.TETHERING_WIFI_ON;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -35,6 +36,9 @@ import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothProfile;
import android.content.Context; import android.content.Context;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.widget.MasterSwitchPreference; import com.android.settings.widget.MasterSwitchPreference;
@@ -109,13 +113,13 @@ public class AllInOneTetherPreferenceControllerTest {
}); });
} }
@Mock
private Context mContext; private Context mContext;
@Mock @Mock
private BluetoothAdapter mBluetoothAdapter; private BluetoothAdapter mBluetoothAdapter;
@Mock @Mock
private MasterSwitchPreference mPreference; private MasterSwitchPreference mPreference;
private static final String PREF_KEY = "tether";
private AllInOneTetherPreferenceController mController; private AllInOneTetherPreferenceController mController;
private final int mTetherState; private final int mTetherState;
private final int mSummaryResId; private final int mSummaryResId;
@@ -127,11 +131,16 @@ public class AllInOneTetherPreferenceControllerTest {
@Before @Before
public void setUp() { public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mController = spy(AllInOneTetherPreferenceController.class); mController = spy(AllInOneTetherPreferenceController.class);
ReflectionHelpers.setField(mController, "mContext", mContext); ReflectionHelpers.setField(mController, "mContext", mContext);
ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter); ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter);
ReflectionHelpers.setField(mController, "mPreference", mPreference); ReflectionHelpers.setField(mController, "mPreferenceKey", PREF_KEY);
PreferenceScreen screen = mock(PreferenceScreen.class);
when(screen.findPreference(PREF_KEY)).thenReturn(mPreference);
doReturn(mController.AVAILABLE).when(mController).getAvailabilityStatus();
mController.displayPreference(screen);
} }
@Test @Test
@@ -169,5 +178,8 @@ public class AllInOneTetherPreferenceControllerTest {
public void getSummary_afterTetherStateChanged() { public void getSummary_afterTetherStateChanged() {
mController.onTetherStateUpdated(mTetherState); mController.onTetherStateUpdated(mTetherState);
assertThat(mController.getSummary()).isEqualTo(mContext.getString(mSummaryResId)); assertThat(mController.getSummary()).isEqualTo(mContext.getString(mSummaryResId));
verify(mController).updateState(mPreference);
verify(mPreference).setSummary(mContext.getString(mSummaryResId));
} }
} }