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

Commit aa72cf1e authored by Danesh Mondegarian's avatar Danesh Mondegarian
Browse files

Profiles : Allow nfc override (1/2) 

Part 2 : http://review.cyanogenmod.org/#/c/37013/

Allow user to override nfc state via profiles
Request jira : https://jira.cyanogenmod.org/browse/CYAN-989

Change-Id: Ief7fa4ab83527f488fbd8c0bc96448a2a2cde6fb
parent 37f90751

core/java/android/app/ConnectionSettings.java

+24 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import android.location.LocationManager; 
import android.net.ConnectivityManager;

import android.net.wifi.WifiManager;

import android.net.wimax.WimaxHelper;

import android.nfc.NfcAdapter;

import android.os.Parcel;

import android.os.Parcelable;

import android.provider.Settings;
@@ -31,6 +32,7 @@ public final class ConnectionSettings implements Parcelable { 
    public static final int PROFILE_CONNECTION_GPS = 4;

    public static final int PROFILE_CONNECTION_SYNC = 5;

    public static final int PROFILE_CONNECTION_BLUETOOTH = 7;

    public static final int PROFILE_CONNECTION_NFC = 8;



    /** @hide */

    public static final Parcelable.Creator<ConnectionSettings> CREATOR = new Parcelable.Creator<ConnectionSettings>() {
@@ -92,6 +94,12 @@ public final class ConnectionSettings implements Parcelable { 
        LocationManager lm = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);

        WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);

        NfcAdapter nfcAdapter = null;

        try {

            nfcAdapter = NfcAdapter.getNfcAdapter(context);

        } catch (UnsupportedOperationException e) {

            //Nfc not available

        }



        boolean forcedState = getValue() == 1;

        boolean currentState;
@@ -141,7 +149,8 @@ public final class ConnectionSettings implements Parcelable { 
                currentState = wm.isWifiApEnabled();

                if (currentState != forcedState) {

                    // Disable wifi

                    if (forcedState && (wifiState == WifiManager.WIFI_STATE_ENABLING) || (wifiState == WifiManager.WIFI_STATE_ENABLED)) {

                    if (forcedState && (wifiState == WifiManager.WIFI_STATE_ENABLING) ||

                            (wifiState == WifiManager.WIFI_STATE_ENABLED)) {

                        wm.setWifiEnabled(false);

                    }

                    wm.setWifiApEnabled(null, forcedState);
@@ -155,6 +164,20 @@ public final class ConnectionSettings implements Parcelable { 
                    }

                }

                break;

            case PROFILE_CONNECTION_NFC:

                if (nfcAdapter != null) {

                    int adapterState = nfcAdapter.getAdapterState();

                    currentState = (adapterState == NfcAdapter.STATE_ON ||

                            adapterState == NfcAdapter.STATE_TURNING_ON);

                    if (currentState != forcedState) {

                        if (forcedState) {

                            nfcAdapter.enable();

                        } else if (!forcedState && adapterState != NfcAdapter.STATE_TURNING_OFF) {

                            nfcAdapter.disable();

                        }

                    }

                }

                break;

        }

    }