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

Commit 71490dc5 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Revert "Add support for sending raw commands" 

Not actually needed, we have sendVendorCommand.

This reverts commit 61015262.

Change-Id: Ibc67c4800b3480c0e278fd22a3ceeb4bbc6d032f
parent 821f8fe1

core/java/android/hardware/Camera.java

+0 −6
Original line number Diff line number Diff line
@@ -1390,12 +1390,6 @@ public class Camera { 


    private native void enableFocusMoveCallback(int enable);



    /**

     * Send a raw command to the camera driver

     * @hide

     */

    public native void sendRawCommand(int arg1, int arg2, int arg3);



    /**

     * Callback interface used to signal the moment of actual image capture.

     *

core/jni/android_hardware_Camera.cpp

+0 −14
Original line number Diff line number Diff line
@@ -1111,7 +1111,6 @@ static void android_hardware_Camera_enableFocusMoveCallback(JNIEnv *env, jobject 
    }

}



<<<<<<< HEAD

static void android_hardware_Camera_sendVendorCommand(JNIEnv *env, jobject thiz,

        jint cmd, jint arg1, jint arg2)

{
@@ -1121,16 +1120,6 @@ static void android_hardware_Camera_sendVendorCommand(JNIEnv *env, jobject thiz, 


    if (camera->sendCommand(cmd, arg1, arg2) != NO_ERROR) {

        jniThrowRuntimeException(env, "sending vendor command failed");

=======

static void android_hardware_Camera_sendRawCommand(JNIEnv *env, jobject thiz, jint arg1, jint arg2, jint arg3)

{

    ALOGV("sendRawCommand %d, %d, %d", arg1, arg2, arg3);

    sp<Camera> camera = get_native_camera(env, thiz, NULL);

    if (camera == 0) return;



    if (camera->sendCommand(arg1, arg2, arg3) != NO_ERROR) {

        jniThrowRuntimeException(env, "send raw command failed");

>>>>>>> 9d8d87f... Add support for sending raw commands

    }

}
@@ -1236,9 +1225,6 @@ static const JNINativeMethod camMethods[] = { 
  { "_sendVendorCommand",

    "(III)V",

    (void *)android_hardware_Camera_sendVendorCommand },

  { "sendRawCommand",

    "(III)V",

    (void *)android_hardware_Camera_sendRawCommand},

};



struct field {