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

Commit d24b8183 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@130745

parent f1e484ac

Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -97,7 +97,9 @@ LOCAL_SRC_FILES += \ 
	core/java/android/view/IWindowManager.aidl \

	core/java/android/view/IWindowSession.aidl \

	core/java/com/android/internal/app/IBatteryStats.aidl \

	core/java/com/android/internal/app/IUsageStats.aidl \

	core/java/com/android/internal/gadget/IGadgetService.aidl \

	core/java/com/android/internal/gadget/IGadgetHost.aidl \

	core/java/com/android/internal/view/IInputContext.aidl \

	core/java/com/android/internal/view/IInputContextCallback.aidl \

	core/java/com/android/internal/view/IInputMethod.aidl \
@@ -173,6 +175,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/view/MotionEvent.aidl \

	frameworks/base/core/java/android/view/Surface.aidl \

	frameworks/base/core/java/android/view/WindowManager.aidl \

	frameworks/base/core/java/android/widget/RemoteViews.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputContext.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputMethod.aidl \

	frameworks/base/core/java/com/android/internal/view/IInputMethodCallback.aidl \

api/3.xml

+2 −2
Original line number Diff line number Diff line
@@ -79027,7 +79027,7 @@ 
 type="java.lang.String"

 transient="false"

 volatile="false"

 value=""name ASC""

 value=""bucket_display_name""

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -79385,7 +79385,7 @@ 
 type="java.lang.String"

 transient="false"

 volatile="false"

 value=""name ASC""

 value=""_display_name""

 static="true"

 final="true"

 deprecated="not deprecated"

api/current.xml

+5415 −326

File changed.

Preview size limit exceeded, changes collapsed.

camera/libcameraservice/CameraHardwareStub.cpp

+18 −0
Original line number Diff line number Diff line
@@ -187,6 +187,24 @@ bool CameraHardwareStub::previewEnabled() { 
    return mPreviewThread != 0;

}



status_t CameraHardwareStub::startRecording(recording_callback cb, void* user)

{

    return UNKNOWN_ERROR;

}



void CameraHardwareStub::stopRecording()

{

}



bool CameraHardwareStub::recordingEnabled()

{

    return false;

}



void CameraHardwareStub::releaseRecordingFrame(const sp<IMemory>& mem)

{

}



// ---------------------------------------------------------------------------



int CameraHardwareStub::beginAutoFocusThread(void *cookie)

camera/libcameraservice/CameraHardwareStub.h

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ public: 
    virtual status_t    startPreview(preview_callback cb, void* user);

    virtual void        stopPreview();

    virtual bool        previewEnabled();



    virtual status_t    startRecording(recording_callback cb, void* user);

    virtual void        stopRecording();

    virtual bool        recordingEnabled();

    virtual void        releaseRecordingFrame(const sp<IMemory>& mem);



    virtual status_t    autoFocus(autofocus_callback, void *user);

    virtual status_t    takePicture(shutter_callback,

                                    raw_callback,