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

Commit 2b793d1e authored by Srikanth Katta's avatar Srikanth Katta Committed by Steve Kondik
Browse files

frameworks/base: Add support for FM feature. 

- Added changes for FM device

Change-Id: I61ab748166e3a8703054b664ba9c53da251f6b83
(cherry picked from commit fa1e277978d7bdf139fe2d790ef4a8b413d31c01)
(cherry picked from commit 2df42ca1ad2b04b9b4920d90ee60658150dfb210)
(cherry picked from commit 292b40317c470e9579bf875f43adecccc2f98b3e)
parent 0d3bb1ad

media/java/android/media/AudioSystem.java

+14 −1
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ public class AudioSystem 
    public static final int DEVICE_OUT_USB_ACCESSORY = 0x2000;

    public static final int DEVICE_OUT_USB_DEVICE = 0x4000;

    public static final int DEVICE_OUT_REMOTE_SUBMIX = 0x8000;



    public static final int DEVICE_OUT_FM = 0x80000;

    public static final int DEVICE_OUT_FM_TX = 0x100000;

    public static final int DEVICE_OUT_DEFAULT = DEVICE_BIT_DEFAULT;



    public static final int DEVICE_OUT_ALL = (DEVICE_OUT_EARPIECE |
@@ -246,6 +247,8 @@ public class AudioSystem 
                                              DEVICE_OUT_USB_ACCESSORY |

                                              DEVICE_OUT_USB_DEVICE |

                                              DEVICE_OUT_REMOTE_SUBMIX |

                                              DEVICE_OUT_FM |

                                              DEVICE_OUT_FM_TX |

                                              DEVICE_OUT_DEFAULT);

    public static final int DEVICE_OUT_ALL_A2DP = (DEVICE_OUT_BLUETOOTH_A2DP |

                                                   DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |
@@ -270,6 +273,8 @@ public class AudioSystem 
    public static final int DEVICE_IN_DGTL_DOCK_HEADSET = DEVICE_BIT_IN | 0x400;

    public static final int DEVICE_IN_USB_ACCESSORY = DEVICE_BIT_IN | 0x800;

    public static final int DEVICE_IN_USB_DEVICE = DEVICE_BIT_IN | 0x1000;

    public static final int DEVICE_IN_FM_RX = DEVICE_BIT_IN | 0x8000;

    public static final int DEVICE_IN_FM_RX_A2DP = DEVICE_BIT_IN | 0x10000;

    public static final int DEVICE_IN_DEFAULT = DEVICE_BIT_IN | DEVICE_BIT_DEFAULT;



    public static final int DEVICE_IN_ALL = (DEVICE_IN_COMMUNICATION |
@@ -285,6 +290,8 @@ public class AudioSystem 
                                             DEVICE_IN_DGTL_DOCK_HEADSET |

                                             DEVICE_IN_USB_ACCESSORY |

                                             DEVICE_IN_USB_DEVICE |

                                             DEVICE_IN_FM_RX |

                                             DEVICE_IN_FM_RX_A2DP |

                                             DEVICE_IN_DEFAULT);

    public static final int DEVICE_IN_ALL_SCO = DEVICE_IN_BLUETOOTH_SCO_HEADSET;
@@ -309,6 +316,8 @@ public class AudioSystem 
    public static final String DEVICE_OUT_USB_ACCESSORY_NAME = "usb_accessory";

    public static final String DEVICE_OUT_USB_DEVICE_NAME = "usb_device";

    public static final String DEVICE_OUT_REMOTE_SUBMIX_NAME = "remote_submix";

    public static final String DEVICE_OUT_FM_NAME = "fm";

    public static final String DEVICE_OUT_FM_TX_NAME = "fm_tx";



    public static String getDeviceName(int device)

    {
@@ -345,6 +354,10 @@ public class AudioSystem 
            return DEVICE_OUT_USB_DEVICE_NAME;

        case DEVICE_OUT_REMOTE_SUBMIX:

            return DEVICE_OUT_REMOTE_SUBMIX_NAME;

        case DEVICE_OUT_FM:

            return DEVICE_OUT_FM_NAME;

        case DEVICE_OUT_FM_TX:

            return DEVICE_OUT_FM_TX_NAME;

        case DEVICE_OUT_DEFAULT:

        default:

            return "";

media/java/android/media/MediaRecorder.java

+7 −1
Original line number Diff line number Diff line
@@ -213,6 +213,12 @@ public class MediaRecorder 
         * @hide

         */

        protected static final int HOTWORD = 1999;



        /** @hide */

        public static final int FM_RX = 9;



        /** @hide */

        public static final int FM_RX_A2DP = 10;

    }



    /**
@@ -328,7 +334,7 @@ public class MediaRecorder 
     * @see android.media.MediaRecorder.AudioSource

     */

    public static final int getAudioSourceMax() {

        return AudioSource.REMOTE_SUBMIX;

        return AudioSource.FM_RX_A2DP;

    }



    /**