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

Merge "Fix a incorrect type cast for alert dialog"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-16 21:08:21 +00:00
committed by Android (Google) Code Review
parent ed2486a6c1 420f385a18
commit 9eb270e15e
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/PrivateDnsModeDialogPreference.java
View File

@@ -22,7 +22,6 @@ import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME
import static android.system.OsConstants.AF_INET; import static android.system.OsConstants.AF_INET;
import static android.system.OsConstants.AF_INET6; import static android.system.OsConstants.AF_INET6;
import android.app.AlertDialog;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -52,6 +51,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
/** /**
* Dialog to set the Private DNS * Dialog to set the Private DNS
@@ -72,7 +72,7 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME, R.id.private_dns_mode_provider); PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME, R.id.private_dns_mode_provider);
} }
private static final int[] ADDRESS_FAMILIES = new int[]{AF_INET, AF_INET6}; private static final int[] ADDRESS_FAMILIES = new int[] {AF_INET, AF_INET6};
@VisibleForTesting @VisibleForTesting
static final String MODE_KEY = Settings.Global.PRIVATE_DNS_MODE; static final String MODE_KEY = Settings.Global.PRIVATE_DNS_MODE;

2
src/com/android/settings/widget/ValidatedEditTextPreference.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.widget; package com.android.settings.widget;
import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.text.Editable; import android.text.Editable;
import android.text.InputType; import android.text.InputType;
@@ -30,6 +29,7 @@ import android.widget.TextView;
import com.android.settingslib.CustomEditTextPreferenceCompat; import com.android.settingslib.CustomEditTextPreferenceCompat;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
/** /**

9
tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
View File

@@ -25,7 +25,6 @@ import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.AlertDialog;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -49,6 +48,8 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers;
import androidx.appcompat.app.AlertDialog;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowOs.class) @Config(shadows = ShadowOs.class)
public class PrivateDnsModeDialogPreferenceTest { public class PrivateDnsModeDialogPreferenceTest {
@@ -132,9 +133,9 @@ public class PrivateDnsModeDialogPreferenceTest {
@Test @Test
public void testOnCheckedChanged_switchMode_saveButtonHasCorrectState() { public void testOnCheckedChanged_switchMode_saveButtonHasCorrectState() {
final String[] INVALID_HOST_NAMES = new String[] { final String[] INVALID_HOST_NAMES = new String[] {
INVALID_HOST_NAME, INVALID_HOST_NAME,
"2001:db8::53", // IPv6 string literal "2001:db8::53", // IPv6 string literal
"192.168.1.1", // IPv4 string literal "192.168.1.1", // IPv4 string literal
}; };
for (String invalid : INVALID_HOST_NAMES) { for (String invalid : INVALID_HOST_NAMES) {