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

Merge "Fix crash issue when click 'Share' button"

Browse Source
This commit is contained in:
Johnson Lu
2019-01-21 13:08:28 +00:00
committed by Android (Google) Code Review
parent 32d561653c 69b31596a2
commit c706c643a0
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -442,9 +442,9 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
private void updateIpLayerInfo() { private void updateIpLayerInfo() {
mButtonsPref.setButton2Visible(canSignIntoNetwork()); mButtonsPref.setButton2Visible(canSignIntoNetwork());
mButtonsPref.setButton3Visible(isSharingNetworkEnabled()); mButtonsPref.setButton3Visible(canShareNetwork());
mButtonsPref.setVisible( mButtonsPref.setVisible(
canSignIntoNetwork() || canForgetNetwork() || isSharingNetworkEnabled()); canSignIntoNetwork() || canForgetNetwork() || canShareNetwork());
if (mNetwork == null || mLinkProperties == null) { if (mNetwork == null || mLinkProperties == null) {
mIpAddressPref.setVisible(false); mIpAddressPref.setVisible(false);
@@ -532,8 +532,9 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
/** /**
* Returns whether the user can share the network represented by this preference with QR code. * Returns whether the user can share the network represented by this preference with QR code.
*/ */
private boolean isSharingNetworkEnabled() { private boolean canShareNetwork() {
return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.WIFI_SHARING); return mAccessPoint.getConfig() != null && FeatureFlagUtils.isEnabled(mContext,
FeatureFlags.WIFI_SHARING);
} }
/** /**

9
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -685,6 +685,15 @@ public class WifiDetailPreferenceControllerTest {
verify(mockButtonsPref).setButton1Visible(false); verify(mockButtonsPref).setButton1Visible(false);
} }
@Test
public void canShareNetwork_noNetwork() {
when(mockAccessPoint.getConfig()).thenReturn(null);
displayAndResume();
verify(mockButtonsPref).setButton3Visible(false);
}
@Test @Test
public void canModifyNetwork_saved() { public void canModifyNetwork_saved() {
assertThat(mController.canModifyNetwork()).isTrue(); assertThat(mController.canModifyNetwork()).isTrue();