Fix NFC state switched off every time user entered connection preferences page

am: e4c2e427a1

Change-Id: If4545377b7c6196027b89514a91a2b7068f1202b

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

@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.nfc;
-
-import android.content.Context;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.nfc.NfcAdapter;
-import android.os.Handler;
-import android.os.Looper;
-import android.provider.Settings;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
-/**
- * NfcAirplaneModeObserver is a helper to manage the Nfc on/off when airplane mode status
- * is changed.
- */
-public class NfcAirplaneModeObserver extends ContentObserver {
-
-    private final Context mContext;
-    private final NfcAdapter mNfcAdapter;
-    private final Preference mPreference;
-    private int mAirplaneMode;
-
-    @VisibleForTesting
-    final static Uri AIRPLANE_MODE_URI =
-            Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);
-
-    public NfcAirplaneModeObserver(Context context, NfcAdapter nfcAdapter, Preference preference) {
-        super(new Handler(Looper.getMainLooper()));
-        mContext = context;
-        mNfcAdapter = nfcAdapter;
-        mPreference = preference;
-        updateNfcPreference();
-    }
-
-    public void register() {
-        mContext.getContentResolver().registerContentObserver(AIRPLANE_MODE_URI, false, this);
-    }
-
-    public void unregister() {
-        mContext.getContentResolver().unregisterContentObserver(this);
-    }
-
-    @Override
-    public void onChange(boolean selfChange, Uri uri) {
-        super.onChange(selfChange, uri);
-        updateNfcPreference();
-    }
-
-    private void updateNfcPreference() {
-        final int airplaneMode = Settings.Global.getInt(
-                mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, mAirplaneMode);
-        if (airplaneMode == mAirplaneMode) {
-            return;
-        }
-
-        mAirplaneMode = airplaneMode;
-        if (mAirplaneMode == 1) {
-            // airplane mode is on, need to turn off NFC, and check if user can toggle it
-            mNfcAdapter.disable();
-            mPreference.setEnabled(NfcPreferenceController.isToggleableInAirplaneMode(mContext));
-        } else {
-            // airplane mode is off, no restriction
-            mPreference.setEnabled(true);
-        }
-    }
-}

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

@@ -41,8 +41,6 @@ public class NfcPreferenceController extends TogglePreferenceController
     public static final String KEY_TOGGLE_NFC = "toggle_nfc";
     private final NfcAdapter mNfcAdapter;
     private NfcEnabler mNfcEnabler;
-    @VisibleForTesting
-    NfcAirplaneModeObserver mAirplaneModeObserver;
 
     public NfcPreferenceController(Context context, String key) {
         super(context, key);
@@ -61,11 +59,6 @@ public class NfcPreferenceController extends TogglePreferenceController
 
         mNfcEnabler = new NfcEnabler(mContext, switchPreference);
 
-        // Listen to airplane mode updates if NFC should be turned off when airplane mode is on
-        if (shouldTurnOffNFCInAirplaneMode(mContext) || isToggleableInAirplaneMode(mContext)) {
-            mAirplaneModeObserver =
-                    new NfcAirplaneModeObserver(mContext, mNfcAdapter, switchPreference);
-        }
     }
 
     @Override
@@ -108,9 +101,6 @@ public class NfcPreferenceController extends TogglePreferenceController
 
     @Override
     public void onResume() {
-        if (mAirplaneModeObserver != null) {
-            mAirplaneModeObserver.register();
-        }
         if (mNfcEnabler != null) {
             mNfcEnabler.resume();
         }
@@ -118,9 +108,6 @@ public class NfcPreferenceController extends TogglePreferenceController
 
     @Override
     public void onPause() {
-        if (mAirplaneModeObserver != null) {
-            mAirplaneModeObserver.unregister();
-        }
         if (mNfcEnabler != null) {
             mNfcEnabler.pause();
         }