Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev am: 32c75f49a7 am: 69ea8a2adc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24548405 Change-Id: I2fa673e9c0314d045cbe59e7b743403ee6231be6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -25,7 +25,6 @@ import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.os.Bundle;
|
||||
import android.os.PersistableBundle;
|
||||
import android.provider.Settings;
|
||||
import android.telephony.CarrierConfigManager;
|
||||
import android.telephony.CellIdentity;
|
||||
import android.telephony.CellIdentityGsm;
|
||||
@@ -37,6 +36,7 @@ import android.telephony.CellSignalStrengthGsm;
|
||||
import android.telephony.CellSignalStrengthLte;
|
||||
import android.telephony.TelephonyManager;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceCategory;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
@@ -310,4 +310,13 @@ public class NetworkSelectSettingsTest {
|
||||
cellInfoGsm.setCellSignalStrength(cssg);
|
||||
return cellInfoGsm;
|
||||
}
|
||||
|
||||
@Test
|
||||
@UiThreadTest
|
||||
public void onPreferenceTreeClick_notNetworkOperatorPreference_noCrash() {
|
||||
mNetworkSelectSettings.onCreateInitialization();
|
||||
mNetworkSelectSettings.enablePreferenceScreen(true);
|
||||
|
||||
mNetworkSelectSettings.onPreferenceTreeClick(new Preference(mContext));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user