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

Commit d09ee282 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge "Set the Adapter Service onCreate()" am: 168c7e0f 

am: d046cb07

Change-Id: Ib9f141fb5bbd2db4b62e4f8b35ce0cd160c877b4
parents bb9731e1 d046cb07

src/com/android/bluetooth/btservice/AdapterService.java

+2 −3
Original line number Diff line number Diff line
@@ -521,6 +521,8 @@ public class AdapterService extends Service { 
        registerReceiver(mAlarmBroadcastReceiver, new IntentFilter(ACTION_ALARM_WAKEUP));

        mProfileObserver = new ProfileObserver(getApplicationContext(), this, new Handler());

        mProfileObserver.start();



        setAdapterService(this);

    }



    @Override
@@ -576,9 +578,6 @@ public class AdapterService extends Service { 
            // Ignore.

        }



        //FIXME: Set static instance here???

        setAdapterService(this);



        //Start Gatt service

        setGattProfileServiceState(supportedProfileServices,BluetoothAdapter.STATE_ON);

    }