Merge "Added check for preference click"

This commit is contained in:
Lee Chou
2020-02-20 04:47:10 +00:00
committed by Android (Google) Code Review

View File

@@ -21,6 +21,7 @@ import android.content.Intent;
import android.provider.Settings; import android.provider.Settings;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.euicc.EuiccManager; import android.telephony.euicc.EuiccManager;
import android.text.TextUtils;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -60,19 +61,23 @@ public class DeleteSimProfilePreferenceController extends BasePreferenceControll
@Override @Override
public boolean handlePreferenceTreeClick(Preference preference) { public boolean handlePreferenceTreeClick(Preference preference) {
boolean confirmDeletion = if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
Settings.Global.getInt( boolean confirmDeletion =
mContext.getContentResolver(), Settings.Global.getInt(
ConfirmSimDeletionPreferenceController.KEY_CONFIRM_SIM_DELETION, mContext.getContentResolver(),
mConfirmationDefaultOn ? 1 : 0) ConfirmSimDeletionPreferenceController.KEY_CONFIRM_SIM_DELETION,
== 1; mConfirmationDefaultOn ? 1 : 0)
if (confirmDeletion) { == 1;
WifiDppUtils.showLockScreen(mContext, () -> deleteSim()); if (confirmDeletion) {
} else { WifiDppUtils.showLockScreen(mContext, () -> deleteSim());
deleteSim(); } else {
deleteSim();
}
return true;
} }
return true; return false;
} }
private void deleteSim() { private void deleteSim() {