Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 420f385a authored by Fan Zhang's avatar Fan Zhang
Browse files

Fix a incorrect type cast for alert dialog 

Change-Id: I2265c4510785f88ef7950cd29779848eb2e58dc4
Fixes: 111488148
Test: manual
parent 9bd5b318

src/com/android/settings/network/PrivateDnsModeDialogPreference.java

+2 −2
Original line number Diff line number Diff line
@@ -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_INET6;



import android.app.AlertDialog;

import android.content.ActivityNotFoundException;

import android.content.ContentResolver;

import android.content.Context;
@@ -52,6 +51,7 @@ import java.util.HashMap; 
import java.util.Map;



import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;



/**

 * Dialog to set the Private DNS

src/com/android/settings/widget/ValidatedEditTextPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.widget;



import android.app.AlertDialog;

import android.content.Context;

import android.text.Editable;

import android.text.InputType;
@@ -30,6 +29,7 @@ import android.widget.TextView; 
import com.android.settingslib.CustomEditTextPreferenceCompat;



import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;

import androidx.preference.PreferenceViewHolder;



/**

tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java

+5 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static org.mockito.Mockito.anyInt; 
import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



import android.app.AlertDialog;

import android.content.ContentResolver;

import android.content.Context;

import android.content.DialogInterface;
@@ -49,6 +48,8 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;



import androidx.appcompat.app.AlertDialog;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(shadows = ShadowOs.class)

public class PrivateDnsModeDialogPreferenceTest {