settings(nfc): Remove reference to APM setting in NFC page
APM mode no longer affects NFC stack as of Android Q. Bug: 275381319 Test: atest NfcEnablerTest NfcPreferenceControllerTest Test: Manual settings page verification Change-Id: I974a424332eb85e27d51816507183e1ca0def42c
This commit is contained in:
@@ -18,9 +18,6 @@ package com.android.settings.nfc;
|
||||
|
||||
import android.content.Context;
|
||||
import android.nfc.NfcAdapter;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.settingslib.widget.MainSwitchPreference;
|
||||
|
||||
@@ -41,7 +38,7 @@ public class NfcEnabler extends BaseNfcEnabler {
|
||||
switch (newState) {
|
||||
case NfcAdapter.STATE_OFF:
|
||||
mPreference.updateStatus(false);
|
||||
mPreference.setEnabled(isToggleable());
|
||||
mPreference.setEnabled(true);
|
||||
break;
|
||||
case NfcAdapter.STATE_ON:
|
||||
mPreference.updateStatus(true);
|
||||
@@ -57,15 +54,4 @@ public class NfcEnabler extends BaseNfcEnabler {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
boolean isToggleable() {
|
||||
if (NfcPreferenceController.isToggleableInAirplaneMode(mContext)
|
||||
|| !NfcPreferenceController.shouldTurnOffNFCInAirplaneMode(mContext)) {
|
||||
return true;
|
||||
}
|
||||
final int airplaneMode = Settings.Global.getInt(
|
||||
mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0);
|
||||
return airplaneMode != 1;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user