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

Commit 2ffd81d5 authored by Ashish Kumar Gupta's avatar Ashish Kumar Gupta
Browse files

Remove AOAv2 Audio driver support 

Remove AOAv2 Audio driver support from UsbDeviceManager

Bug: 328249611
Test: Build the code
Test: atest UsbDetailsFunctionsControllerTest
Change-Id: I1e34f7c5f94c4f65613c9df3d48d1b5c49340c1f
parent 00481176

services/core/jni/com_android_server_UsbDeviceManager.cpp

+7 −22
Original line number Diff line number Diff line
@@ -108,18 +108,6 @@ static jboolean android_server_UsbDeviceManager_isStartRequested(JNIEnv* /* env 
    return (result == 1);

}



static jint android_server_UsbDeviceManager_getAudioMode(JNIEnv* /* env */, jobject /* thiz */)

{

    int fd = open(DRIVER_NAME, O_RDWR);

    if (fd < 0) {

        ALOGE("could not open %s", DRIVER_NAME);

        return false;

    }

    int result = ioctl(fd, ACCESSORY_GET_AUDIO_MODE);

    close(fd);

    return result;

}



static jobject android_server_UsbDeviceManager_openControl(JNIEnv *env, jobject /* thiz */, jstring jFunction) {

    ScopedUtfChars function(env, jFunction);

    bool ptp = false;
@@ -152,10 +140,7 @@ static const JNINativeMethod method_table[] = { 
         (void *)android_server_UsbDeviceManager_getAccessoryStrings},

        {"nativeOpenAccessory", "()Landroid/os/ParcelFileDescriptor;",

         (void *)android_server_UsbDeviceManager_openAccessory},

    { "nativeIsStartRequested",     "()Z",

                                    (void*)android_server_UsbDeviceManager_isStartRequested },

    { "nativeGetAudioMode",         "()I",

                                    (void*)android_server_UsbDeviceManager_getAudioMode },

        {"nativeIsStartRequested", "()Z", (void *)android_server_UsbDeviceManager_isStartRequested},

        {"nativeOpenControl", "(Ljava/lang/String;)Ljava/io/FileDescriptor;",

         (void *)android_server_UsbDeviceManager_openControl},

};

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+0 −10
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
            "/sys/class/android_usb/android0/state";

    private static final String RNDIS_ETH_ADDR_PATH =

            "/sys/class/android_usb/android0/f_rndis/ethaddr";

    private static final String AUDIO_SOURCE_PCM_PATH =

            "/sys/class/android_usb/android0/f_audio_source/pcm";

    private static final String MIDI_ALSA_PATH =

            "/sys/class/android_usb/android0/f_midi/alsa";
@@ -172,8 +170,6 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
    private static final int MSG_UPDATE_USB_SPEED = 22;

    private static final int MSG_UPDATE_HAL_VERSION = 23;



    private static final int AUDIO_MODE_SOURCE = 1;



    // Delay for debouncing USB disconnects.

    // We often get rapid connect/disconnect events when enabling USB functions,

    // which need debouncing.
@@ -464,7 +460,6 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
        int operationId = sUsbOperationCount.incrementAndGet();



        mAccessoryStrings = nativeGetAccessoryStrings();

        boolean enableAudio = (nativeGetAudioMode() == AUDIO_MODE_SOURCE);

        // don't start accessory mode if our mandatory strings have not been set

        boolean enableAccessory = (mAccessoryStrings != null &&

                mAccessoryStrings[UsbAccessory.MANUFACTURER_STRING] != null &&
@@ -474,9 +469,6 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
        if (enableAccessory) {

            functions |= UsbManager.FUNCTION_ACCESSORY;

        }

        if (enableAudio) {

            functions |= UsbManager.FUNCTION_AUDIO_SOURCE;

        }



        if (functions != UsbManager.FUNCTION_NONE) {

            mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_ACCESSORY_MODE_ENTER_TIMEOUT),
@@ -2490,6 +2482,4 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
    private native FileDescriptor nativeOpenControl(String usbFunction);



    private native boolean nativeIsStartRequested();



    private native int nativeGetAudioMode();

}