commit c0659ea40d032b7d90422774db1550d2881511de
author Daniel Nishi <dhnishi@google.com> Wed Jul 26 11:13:55 2017 -0700
committer Daniel Nishi <dhnishi@google.com> Thu Jul 27 13:06:33 2017 -0700
tree 653f039866751554fef7a8de982aad37d11df821
parent 4b8f2c9ad51f489514ecaf047f7c890b9f3c2a96

Make nfc toggability logic static and public.

Test: exercised in other robotests
Change-Id: Id51c9fd820afd539c1d647feb90eecf73ffbf4a7

src/com/android/settings/nfc/NfcPreferenceController.java

diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index 0743871..e5d47fb 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -66,10 +66,8 @@
         mBeamPreference = (RestrictedPreference) screen.findPreference(
                 KEY_ANDROID_BEAM_SETTINGS);
         mNfcEnabler = new NfcEnabler(mContext, mNfcPreference, mBeamPreference);
-        String toggleable = Settings.Global.getString(mContext.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
         // Manually set dependencies for NFC when not toggleable.
-        if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_NFC)) {
+        if (!isToggleableInAirplaneMode(mContext)) {
             mAirplaneModeObserver = new AirplaneModeObserver();
             updateNfcPreference();
         }
@@ -133,6 +131,12 @@
         mBeamPreference.setEnabled(toggleable);
     }
 
+    public static boolean isToggleableInAirplaneMode(Context context) {
+        String toggleable = Settings.Global.getString(context.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
+        return toggleable != null && toggleable.contains(Settings.Global.RADIO_NFC);
+    }
+
     private final class AirplaneModeObserver extends ContentObserver {
         private final Uri AIRPLANE_MODE_URI =
                 Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);