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

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

Migrate MAP client enable/disable to sysprops am: cbb3c5da am: 4bf6275e 

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



Change-Id: I94784b143cc4d3584cb2b64e33bb111895b9b63b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 468eceba 4bf6275e

android/app/AndroidManifest.xml

+10 −8
Original line number Diff line number Diff line
@@ -296,6 +296,16 @@ 
             android:exported="false">

        </provider>



        <!--  Message Access Profile (MAP) client Profile Service  -->

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

             android:name="com.android.bluetooth.mapclient.MapClientService"

             android:enabled="true"

             android:exported="true">

            <intent-filter>

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

            </intent-filter>

        </service>



        <!--  Media Control Profile (MCP) server Profile Service  -->

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

             android:name="com.android.bluetooth.mcp.McpService"
@@ -479,14 +489,6 @@ 
                <action android:name="android.bluetooth.IBluetoothPbap"/>

            </intent-filter>

        </service>

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

             android:name=".mapclient.MapClientService"

             android:enabled="@bool/profile_supported_mapmce"

             android:exported="true">

            <intent-filter>

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

            </intent-filter>

        </service>

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

             android:name=".sap.SapService"

             android:enabled="@bool/profile_supported_sap"

android/app/res/values/config.xml

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

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

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

    <bool name="profile_supported_mapmce">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/mapclient/MapClientService.java

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.net.Uri;

import android.os.ParcelUuid;

import android.sysprop.BluetoothProperties;

import android.util.Log;



import com.android.bluetooth.Utils;
@@ -65,6 +66,10 @@ public class MapClientService extends ProfileService { 
    private static MapClientService sMapClientService;

    private MapBroadcastReceiver mMapReceiver;



    public static boolean isEnabled() {

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

    }



    public static synchronized MapClientService getMapClientService() {

        if (sMapClientService == null) {

            Log.w(TAG, "getMapClientService(): service is null");

android/app/tests/unit/src/com/android/bluetooth/mapclient/MapClientStateMachineTest.java

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

        mTargetContext = InstrumentationRegistry.getTargetContext();

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

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

                MapClientService.isEnabled());

        MockitoAnnotations.initMocks(this);

        mMockContentProvider = new MockSmsContentProvider();

        mMockContentResolver = new MockContentResolver();
@@ -142,7 +142,7 @@ public class MapClientStateMachineTest { 


    @After

    public void tearDown() throws Exception {

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

        if (!MapClientService.isEnabled()) {

            return;

        }

android/app/tests/unit/src/com/android/bluetooth/mapclient/MapClientTest.java

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

        mTargetContext = InstrumentationRegistry.getTargetContext();

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

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

                MapClientService.isEnabled());

        MockitoAnnotations.initMocks(this);

        TestUtils.setAdapterService(mAdapterService);

        when(mAdapterService.getDatabase()).thenReturn(mDatabaseManager);
@@ -82,7 +82,7 @@ public class MapClientTest { 


    @After

    public void tearDown() throws Exception {

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

        if (!MapClientService.isEnabled()) {

            return;

        }

        TestUtils.stopService(mServiceRule, MapClientService.class);