Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f7c40c8 authored by Anas Karbila's avatar Anas Karbila
Browse files

NfcTile: make sure NFC adapter is always available when needed 

Test: enable NFC->reboot->directly open QS panel, NFC tile will show disabled state. This commit fixes it.

Change-Id: Iabbe4ec11a38614b9c65627d58c6ee9ec93435f3
parent 6f029bbc

packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java

+15 −12
Original line number Diff line number Diff line
@@ -54,13 +54,6 @@ public class NfcTile extends QSTile<QSTile.BooleanState> { 
        if (mListening) {

            mContext.registerReceiver(mNfcReceiver,

                    new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED));

            if (mAdapter == null) {

                try {

                    mAdapter = NfcAdapter.getNfcAdapter(mContext);

                } catch (UnsupportedOperationException e) {

                    mAdapter = null;

                }

            }

        } else {

            mContext.unregisterReceiver(mNfcReceiver);

        }
@@ -82,12 +75,11 @@ public class NfcTile extends QSTile<QSTile.BooleanState> { 


    @Override

    protected void handleClick() {

        if (mAdapter == null) return;

        MetricsLogger.action(mContext, getMetricsCategory(), !mState.value);

        if (!mAdapter.isEnabled()) {

            mAdapter.enable();

        if (!getAdapter().isEnabled()) {

            getAdapter().enable();

        } else {

            mAdapter.disable();

            getAdapter().disable();

        }

    }
@@ -105,7 +97,7 @@ public class NfcTile extends QSTile<QSTile.BooleanState> { 
    protected void handleUpdateState(BooleanState state, Object arg) {

        final Drawable mEnable = mContext.getDrawable(R.drawable.ic_qs_nfc_enabled);

        final Drawable mDisable = mContext.getDrawable(R.drawable.ic_qs_nfc_disabled);

        state.value = mAdapter == null ? false : mAdapter.isEnabled();

        state.value = getAdapter().isEnabled();

        state.label = mContext.getString(R.string.quick_settings_nfc_label);

        state.icon = new DrawableIcon(state.value ? mEnable : mDisable);

        state.minimalAccessibilityClassName = state.expandedAccessibilityClassName
@@ -127,6 +119,17 @@ public class NfcTile extends QSTile<QSTile.BooleanState> { 
        }

    }



    private NfcAdapter getAdapter() {

        if (mAdapter == null) {

            try {

                mAdapter = NfcAdapter.getNfcAdapter(mContext);

            } catch (UnsupportedOperationException e) {

                mAdapter = null;

            }

        }

        return mAdapter;

    }



    private BroadcastReceiver mNfcReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {