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

Commit f9e2c936 authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan
Browse files

Profile: disable triggers when profiles are disabled 

Change-Id: Ic25bd90deb1979f2a7f21a5b588e5f1e18834864
parent e3fb8dde

services/java/com/android/server/ProfileTriggerHelper.java

+37 −6
Original line number Diff line number Diff line
@@ -22,15 +22,18 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.database.ContentObserver;

import android.net.wifi.WifiManager;

import android.net.wifi.WifiSsid;

import android.net.wifi.WifiInfo;

import android.os.Handler;

import android.provider.Settings;

import android.util.Log;



import java.util.UUID;



public class ProfileTriggerHelper extends BroadcastReceiver {

    private static final String TAG = "ProfileTriggerService";

    private static final String TAG = "ProfileTriggerHelper";



    private Context mContext;

    private ProfileManagerService mService;
@@ -38,6 +41,16 @@ public class ProfileTriggerHelper extends BroadcastReceiver { 
    private WifiManager mWifiManager;

    private String mLastConnectedSSID;



    private IntentFilter mIntentFilter;

    private boolean mFilterRegistered = false;



    private ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {

        @Override

        public void onChange(boolean selfChange) {

            updateEnabled();

        }

    };



    public ProfileTriggerHelper(Context context, ProfileManagerService service) {

        mContext = context;

        mService = service;
@@ -45,11 +58,29 @@ public class ProfileTriggerHelper extends BroadcastReceiver { 
        mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);

        mLastConnectedSSID = getActiveSSID();



        IntentFilter filter = new IntentFilter();

        filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

        filter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);

        filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);

        mContext.registerReceiver(this, filter);

        mIntentFilter = new IntentFilter();

        mIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

        mIntentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);

        mIntentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);

        updateEnabled();



        mContext.getContentResolver().registerContentObserver(

                Settings.System.getUriFor(Settings.System.SYSTEM_PROFILES_ENABLED), false,

                mSettingsObserver);

    }



    public void updateEnabled() {

        boolean enabled = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.SYSTEM_PROFILES_ENABLED, 1) == 1;

        if (enabled && !mFilterRegistered) {

            Log.v(TAG, "Enabling");

            mContext.registerReceiver(this, mIntentFilter);

            mFilterRegistered = true;

        } else if (!enabled && mFilterRegistered) {

            Log.v(TAG, "Disabling");

            mContext.unregisterReceiver(this);

            mFilterRegistered = false;

        }

    }



    @Override