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

Commit 7a2247f6 authored by Victor Chang's avatar Victor Chang
Browse files

Revert "mcp: Add implementation of Generic Media Control Service" 

Revert submission 15517480-gmcs_sc_dev

Reason for revert: http://b/196112171
Reverted Changes:
Ie2cd94f05:mcp: Add implementation of Generic Media Control S...
I414af9872:mcp: Implement Media Control Profile

Change-Id: Ic9c75e38c71e624367f443d311050268c60a51f8
parent 3a2207a1

android/app/AndroidManifest.xml

+0 −8
Original line number Diff line number Diff line
@@ -372,14 +372,6 @@ 
            </intent-filter>

        </service>

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

             android:name = ".mcp.McpServiceManager"

             android:exported = "true">

            <intent-filter>

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

            </intent-filter>

        </service>

        <service

             android:process="@string/process"

             android:name=".pan.PanService"

             android:enabled="@bool/profile_supported_pan"

             android:exported="true">

android/app/res/values/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
    <bool name="profile_supported_mapmce">false</bool>

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

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

    <bool name="profile_supported_mcp_server">true</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/audio_util/MediaPlayerWrapper.java

+0 −15
Original line number Diff line number Diff line
@@ -175,16 +175,6 @@ public class MediaPlayerWrapper { 
        controller.seekTo(position);

    }



    public void fastForward() {

        MediaController.TransportControls controller = mMediaController.getTransportControls();

        controller.fastForward();

    }



    public void rewind() {

        MediaController.TransportControls controller = mMediaController.getTransportControls();

        controller.rewind();

    }



    public void skipToPrevious() {

        MediaController.TransportControls controller = mMediaController.getTransportControls();

        controller.skipToPrevious();
@@ -195,11 +185,6 @@ public class MediaPlayerWrapper { 
        controller.skipToNext();

    }



    public void setPlaybackSpeed(float speed) {

        MediaController.TransportControls controller = mMediaController.getTransportControls();

        controller.setPlaybackSpeed(speed);

    }



    // TODO (apanicke): Implement shuffle and repeat support. Right now these use custom actions

    // and it may only be possible to do this with Google Play Music

    public boolean isShuffleSupported() {

android/app/src/com/android/bluetooth/audio_util/mockable/MediaController.java

+0 −7
Original line number Diff line number Diff line
@@ -379,13 +379,6 @@ public class MediaController { 
            mTransportDelegate.setRating(rating);

        }



        /**

         * Wrapper for MediaController.TransportControls.setPlaybackSpeed(float speed)

         */

        public void setPlaybackSpeed(float speed) {

            mTransportDelegate.setPlaybackSpeed(speed);

        }



        /**

         * Wrapper for MediaController.TransportControls.sendCustomAction()

         */

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

+0 −3
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import com.android.bluetooth.hid.HidDeviceService; 
import com.android.bluetooth.hid.HidHostService;

import com.android.bluetooth.map.BluetoothMapService;

import com.android.bluetooth.mapclient.MapClientService;

import com.android.bluetooth.mcp.McpServiceManager;

import com.android.bluetooth.opp.BluetoothOppService;

import com.android.bluetooth.pan.PanService;

import com.android.bluetooth.pbap.BluetoothPbapService;
@@ -108,8 +107,6 @@ public class Config { 
                    (1 << BluetoothProfile.PBAP)),

            new ProfileConfig(VolumeControlService.class, R.bool.profile_supported_vc,

                    (1 << BluetoothProfile.VOLUME_CONTROL)),

            new ProfileConfig(McpServiceManager.class, R.bool.profile_supported_mcp_server,

                    (1 << BluetoothProfile.MCP_SERVER)),

            new ProfileConfig(HearingAidService.class,

                    com.android.internal.R.bool.config_hearing_aid_profile_supported,

                    (1 << BluetoothProfile.HEARING_AID))