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

Commit e69c3ee9 authored by Sanket Agarwal's avatar Sanket Agarwal Committed by android-build-merger
Browse files

Merge "Add flag to disable phone policy" 

am: 1188453c

Change-Id: I6129a715e5a43e82f34a867a7333026d87349d95
parents 288d0324 1188453c

android/app/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -71,4 +71,7 @@ 


    <!-- Enabling autoconnect over pan -->

    <bool name="config_bluetooth_pan_enable_autoconnect">true</bool>



    <!-- Enabling the phone policy -->

    <bool name="enable_phone_policy">true</bool>

</resources>

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

+9 −2
Original line number Diff line number Diff line
@@ -422,8 +422,15 @@ public class AdapterService extends Service { 
        mProfileObserver = new ProfileObserver(getApplicationContext(), this, new Handler());

        mProfileObserver.start();



        // Phone policy is specific to phone implementations and hence if a device wants to exclude

        // it out then it can be disabled by using the flag below.

        if (getResources().getBoolean(com.android.bluetooth.R.bool.enable_phone_policy)) {

            Log.i(TAG, "Phone policy enabled");

            mPhonePolicy = new PhonePolicy(this, new ServiceFactory());

            mPhonePolicy.start();

        } else {

            Log.i(TAG, "Phone policy disabled");

        }



        setAdapterService(this);