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

Commit c8c64046 authored by Sal Savage's avatar Sal Savage Committed by Automerger Merge Worker
Browse files

Migrate SAP server enable/disable to sysprops am: 1b3e4c86 

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



Change-Id: I9a5db6734c36caa114109355acf29fdb51f441c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b8851a8 1b3e4c86

android/app/AndroidManifest.xml

+10 −8
Original line number Diff line number Diff line
@@ -364,6 +364,16 @@ 
                 android:resource="@xml/authenticator"/>

        </service>



        <!--  SIM Access Profile (SAP) server Profile Service -->

        <service android:process="@string/process"

             android:name="com.android.bluetooth.sap.SapService"

             android:enabled="true"

             android:exported="true">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothSap"/>

            </intent-filter>

        </service>



        <!--  Telephony Bearer Service (TBS) server Profile Service  -->

        <service

            android:process="@string/process"
@@ -522,14 +532,6 @@ 
                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>

        <service android:process="@string/process"

             android:name=".sap.SapService"

             android:enabled="@bool/profile_supported_sap"

             android:exported="true">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothSap"/>

            </intent-filter>

        </service>

        <service android:process="@string/process"

             android:name=".hfp.HeadsetService"

             android:enabled="@bool/profile_supported_hs_hfp"

android/app/res/values/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
    <bool name="profile_supported_opp">true</bool>

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

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

    <bool name="profile_supported_sap">false</bool>



    <!-- If true, we will require location to be enabled on the device to

         fire Bluetooth LE scan result callbacks in addition to having one

android/app/src/com/android/bluetooth/sap/SapService.java

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.Handler; 
import android.os.Message;

import android.os.ParcelUuid;

import android.os.PowerManager;

import android.sysprop.BluetoothProperties;

import android.text.TextUtils;

import android.util.Log;
@@ -102,6 +103,9 @@ public class SapService extends ProfileService { 
            BluetoothUuid.SAP,

    };



    public static boolean isEnabled() {

        return BluetoothProperties.isProfileSapServerEnabled().orElse(false);

    }



    public SapService() {

        mState = BluetoothSap.STATE_DISCONNECTED;

android/app/tests/unit/src/com/android/bluetooth/sap/SapServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class SapServiceTest { 
    public void setUp() throws Exception {

        mTargetContext = InstrumentationRegistry.getTargetContext();

        Assume.assumeTrue("Ignore test when SapService is not enabled",

                mTargetContext.getResources().getBoolean(R.bool.profile_supported_sap));

                SapService.isEnabled());

        MockitoAnnotations.initMocks(this);

        TestUtils.setAdapterService(mAdapterService);

        doReturn(true, false).when(mAdapterService).isStartedProfile(anyString());
@@ -69,7 +69,7 @@ public class SapServiceTest { 


    @After

    public void tearDown() throws Exception {

        if (!mTargetContext.getResources().getBoolean(R.bool.profile_supported_sap)) {

        if (!SapService.isEnabled()) {

            return;

        }

        TestUtils.stopService(mServiceRule, SapService.class);