Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't try to update Mac address if the preference pane is hidden.

Browse Source 
If the preference controller is marking Mac Address as hidden by the
device, don't bother updating the connectivity.

Bug: 127358664
Test: atest WifiMacAddressPreferenceControllerTest
Change-Id: Ibc3c60b358cd1573a16b020f4b1fcea492b642f5
This commit is contained in:
Ben Lin
2019-06-26 12:08:40 -07:00
parent ee57765372
commit b77cc658fb
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java
View File

@@ -69,8 +69,10 @@ public abstract class AbstractWifiMacAddressPreferenceController
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mWifiMacAddress = screen.findPreference(KEY_WIFI_MAC_ADDRESS);
updateConnectivity();
if (isAvailable()) {
mWifiMacAddress = screen.findPreference(KEY_WIFI_MAC_ADDRESS);
updateConnectivity();
}
}
@Override

19
packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java
View File

@@ -20,7 +20,9 @@ import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.annotation.SuppressLint;
import android.content.Context;
@@ -91,6 +93,19 @@ public class WifiMacAddressPreferenceControllerTest {
.asList().containsAllIn(expectedIntents);
}
@Test
public void updateConnectivity_notAvailable_notCalled() {
boolean mCalled = false;
mController = spy(new ConcreteWifiMacAddressPreferenceController(mContext, mLifecycle) {
@Override
public boolean isAvailable() {
return false;
}
});
mController.displayPreference(mScreen);
verify(mController, never()).updateConnectivity();
}
@Test
public void updateConnectivity_null_setMacUnavailable() {
doReturn(null).when(mWifiManager).getFactoryMacAddresses();
@@ -105,10 +120,6 @@ public class WifiMacAddressPreferenceControllerTest {
doReturn(macAddresses).when(mWifiManager).getFactoryMacAddresses();
mController.displayPreference(mScreen);
assertThat(mPreference.getSummary()).isEqualTo(TEST_MAC_ADDRESS);
}
private static class ConcreteWifiMacAddressPreferenceController