Merge "Fix null pointer exception in wifi settings" into oc-dev (eb6eb99a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/WifiConfigController.java

+14 −6

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.os.Handler;
		import android.os.UserManager;
		import android.security.Credentials;
		import android.security.KeyStore;
		import android.support.annotation.VisibleForTesting;
		import android.text.Editable;
		import android.text.InputType;
		import android.text.TextUtils;
		@@ -54,7 +55,6 @@ import android.widget.CheckBox;
		import android.widget.CompoundButton;
		import android.widget.CompoundButton.OnCheckedChangeListener;
		import android.widget.EditText;
		import android.widget.LinearLayout;
		import android.widget.Spinner;
		import android.widget.TextView;

		@@ -348,9 +348,7 @@ public class WifiConfigController implements TextWatcher,
		}
		}

		final UserManager userManager =
		(UserManager) mContext.getSystemService(Context.USER_SERVICE);
		if (!userManager.isSplitSystemUser()) {
		if (!isSplitSystemUser()) {
		mSharedCheckBox.setVisibility(View.GONE);
		}

		@@ -360,6 +358,13 @@ public class WifiConfigController implements TextWatcher,
		}
		}

		@VisibleForTesting
		boolean isSplitSystemUser() {
		final UserManager userManager =
		(UserManager) mContext.getSystemService(Context.USER_SERVICE);
		return userManager.isSplitSystemUser();
		}

		private void addRow(ViewGroup group, int name, String value) {
		View row = mConfigUi.getLayoutInflater().inflate(R.layout.wifi_dialog_row, group, false);
		((TextView) row.findViewById(R.id.name)).setText(name);
		@@ -407,9 +412,12 @@ public class WifiConfigController implements TextWatcher,
		passwordInvalid = true;
		}
		if ((mSsidView != null && mSsidView.length() == 0)
		// If Accesspoint is not saved, apply passwordInvalid check
		\|\| ((mAccessPoint == null \|\| !mAccessPoint.isSaved()) && passwordInvalid
		// If AccessPoint is saved (we're modifying it), allow zero length (unchanged) pw
		\|\| mAccessPoint.isSaved() && passwordInvalid && mPasswordView.length() > 0)) {
		// If AccessPoint is saved (modifying network) and password is changed, apply
		// Invalid password check
		\|\| mAccessPoint != null && mAccessPoint.isSaved() && passwordInvalid
		&& mPasswordView.length() > 0)) {
		enabled = false;
		} else {
		enabled = ipAndProxyFieldsAreValid();

tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.testutils.shadow;

		import android.net.ConnectivityManager;

		import org.robolectric.annotation.Implementation;
		import org.robolectric.annotation.Implements;

		@Implements(ConnectivityManager.class)
		public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowConnectivityManager {

		@Implementation
		public boolean isNetworkSupported(int networkType) {
		return false;
		}

		}

tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java

0 → 100644

+131 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.wifi;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.widget.Spinner;
		import android.widget.TextView;

		import com.android.settings.R;
		import com.android.settings.SettingsRobolectricTestRunner;
		import com.android.settings.TestConfig;
		import com.android.settings.testutils.shadow.ShadowConnectivityManager;
		import com.android.settingslib.wifi.AccessPoint;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;

		@RunWith(SettingsRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
		shadows = ShadowConnectivityManager.class)
		public class WifiConfigControllerTest {

		@Mock private WifiConfigUiBase mConfigUiBase;
		@Mock private Context mContext;
		@Mock private View mView;
		@Mock private AccessPoint mAccessPoint;

		public WifiConfigController mController;

		// An invalid PSK pass phrase. It is 64 characters long, must not be greater than 63
		private static final String LONG_PSK =
		"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl";
		// An invalid PSK pass phrase. It is 7 characters long, must be at least 8
		private static final String SHORT_PSK = "abcdefg";
		// Valid PSK pass phrase
		private static final String GOOD_PSK = "abcdefghijklmnopqrstuvwxyz";
		private static final int DHCP = 0;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mContext = RuntimeEnvironment.application;
		when(mConfigUiBase.getContext()).thenReturn(mContext);
		when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
		mView = LayoutInflater.from(mContext).inflate(R.layout.wifi_dialog, null);
		final Spinner ipSettingsSpinner = mView.findViewById(R.id.ip_settings);
		ipSettingsSpinner.setSelection(DHCP);

		mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
		WifiConfigUiBase.MODE_CONNECT);
		}
		@Test
		public void isSubmittable_noSSID_shouldReturnFalse() {
		final TextView ssid = mView.findViewById(R.id.ssid);
		ssid.setText("");
		assertThat(mController.isSubmittable()).isFalse();
		}

		@Test
		public void isSubmittable_longPsk_shouldReturnFalse() {
		final TextView password = mView.findViewById(R.id.password);
		password.setText(LONG_PSK);
		assertThat(mController.isSubmittable()).isFalse();

		}
		@Test
		public void isSubmittable_shortPsk_shouldReturnFalse() {
		final TextView password = mView.findViewById(R.id.password);
		password.setText(SHORT_PSK);
		assertThat(mController.isSubmittable()).isFalse();

		}
		@Test
		public void isSubmittable_goodPsk_shouldReturnTrue() {
		final TextView password = mView.findViewById(R.id.password);
		password.setText(GOOD_PSK);
		assertThat(mController.isSubmittable()).isTrue();

		}
		@Test
		public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
		final TextView password = mView.findViewById(R.id.password);
		password.setText("");
		when(mAccessPoint.isSaved()).thenReturn(true);
		assertThat(mController.isSubmittable()).isTrue();
		}
		@Test
		public void isSubmittable_nullAccessPoint_noException() {
		mController = new TestWifiConfigController(mConfigUiBase, mView, null,
		WifiConfigUiBase.MODE_CONNECT);
		mController.isSubmittable();
		}

		public class TestWifiConfigController extends WifiConfigController {

		public TestWifiConfigController(WifiConfigUiBase parent, View view,
		AccessPoint accessPoint, int mode) {
		super(parent, view, accessPoint, mode);
		}

		@Override
		boolean isSplitSystemUser() {
		return false;
		}
		}
		}