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

Commit 6a9d9172 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes I0e6dbcb4,Ie7d140cc into main 

* changes:
  PhonePolicy: use looper to make test faster
  PhonePolicy: unify state change variable order
parents 0f0e1d72 2bf4d716

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

+1 −3
Original line number Diff line number Diff line
@@ -715,9 +715,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");

        }

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

+243 −393

File changed.

Preview size limit exceeded, changes collapsed.

android/app/tests/unit/src/com/android/bluetooth/btservice/PhonePolicyTest.java

+359 −670

File changed.

Preview size limit exceeded, changes collapsed.