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

Commit 1d58f741 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes I0e6dbcb4,Ie7d140cc into main am: 6a9d9172 am: e256cbb0 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3351242



Change-Id: Idca775c3351de28a9707ac1603858bbf1b0182ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f11b0165 e256cbb0

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

+1 −3
Original line number Diff line number Diff line
@@ -716,9 +716,7 @@ public class AdapterService extends Service { 
         */

        if (!isAutomotiveDevice && getResources().getBoolean(R.bool.enable_phone_policy)) {

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

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

            phonePolicy.start();

            mPhonePolicy = Optional.of(phonePolicy);

            mPhonePolicy = Optional.of(new PhonePolicy(this, mLooper, new ServiceFactory()));

        } else {

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

        }