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

Commit 2a73de7b authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Merge commit 'remotes/korg/cupcake' into merge 

Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
parents 42e48026 ba87e3e6

Android.mk

+6 −2
Original line number Diff line number Diff line
@@ -97,7 +97,10 @@ 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/gadget/IGadgetService.aidl \

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

	core/java/com/android/internal/appwidget/IAppWidgetService.aidl \

	core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \

	core/java/com/android/internal/os/IResultReceiver.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 \
@@ -165,7 +168,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/content/Intent.aidl \

	frameworks/base/core/java/android/content/SyncStats.aidl \

	frameworks/base/core/java/android/content/res/Configuration.aidl \

	frameworks/base/core/java/android/gadget/GadgetInfo.aidl \

	frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \

	frameworks/base/core/java/android/net/Uri.aidl \

	frameworks/base/core/java/android/os/Bundle.aidl \

	frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \
@@ -173,6 +176,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 −13
Original line number Diff line number Diff line
@@ -25763,17 +25763,6 @@ 
 visibility="public"

>

</field>

<field name="CATEGORY_GADGET"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.category.GADGET&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CATEGORY_HOME"

 type="java.lang.String"

 transient="false"
@@ -79027,7 +79016,7 @@ 
 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;name ASC&quot;"

 value="&quot;bucket_display_name&quot;"

 static="true"

 final="true"

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

 transient="false"

 volatile="false"

 value="&quot;name ASC&quot;"

 value="&quot;_display_name&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

api/current.xml

+8736 −1045

File changed.

Preview size limit exceeded, changes collapsed.

camera/libcameraservice/CameraHardwareStub.cpp

+41 −14
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ namespace android { 


CameraHardwareStub::CameraHardwareStub()

                  : mParameters(),

                    mHeap(0),

                    mPreviewHeap(0),

                    mRawHeap(0),

                    mFakeCamera(0),

                    mPreviewFrameSize(0),

                    mRawPictureCallback(0),
@@ -62,13 +63,17 @@ void CameraHardwareStub::initDefaultParameters() 


void CameraHardwareStub::initHeapLocked()

{

    int width, height;

    mParameters.getPreviewSize(&width, &height);

    // Create raw heap.

    int picture_width, picture_height;

    mParameters.getPictureSize(&picture_width, &picture_height);

    mRawHeap = new MemoryHeapBase(picture_width * 2 * picture_height);



    LOGD("initHeapLocked: preview size=%dx%d", width, height);

    int preview_width, preview_height;

    mParameters.getPreviewSize(&preview_width, &preview_height);

    LOGD("initHeapLocked: preview size=%dx%d", preview_width, preview_height);



    // Note that we enforce yuv422 in setParameters().

    int how_big = width * height * 2;

    int how_big = preview_width * preview_height * 2;



    // If we are being reinitialized to the same size as before, no

    // work needs to be done.
@@ -79,15 +84,15 @@ void CameraHardwareStub::initHeapLocked() 


    // Make a new mmap'ed heap that can be shared across processes. 

    // use code below to test with pmem

    mHeap = new MemoryHeapBase(mPreviewFrameSize * kBufferCount);

    mPreviewHeap = new MemoryHeapBase(mPreviewFrameSize * kBufferCount);

    // Make an IMemory for each frame so that we can reuse them in callbacks.

    for (int i = 0; i < kBufferCount; i++) {

        mBuffers[i] = new MemoryBase(mHeap, i * mPreviewFrameSize, mPreviewFrameSize);

        mBuffers[i] = new MemoryBase(mPreviewHeap, i * mPreviewFrameSize, mPreviewFrameSize);

    }

    

    // Recreate the fake camera to reflect the current size.

    delete mFakeCamera;

    mFakeCamera = new FakeCamera(width, height);

    mFakeCamera = new FakeCamera(preview_width, preview_height);

}



CameraHardwareStub::~CameraHardwareStub()
@@ -99,7 +104,12 @@ CameraHardwareStub::~CameraHardwareStub() 


sp<IMemoryHeap> CameraHardwareStub::getPreviewHeap() const

{

    return mHeap;

    return mPreviewHeap;

}



sp<IMemoryHeap> CameraHardwareStub::getRawHeap() const

{

    return mRawHeap;

}



// ---------------------------------------------------------------------------
@@ -114,7 +124,7 @@ int CameraHardwareStub::previewThread() 
        // Find the offset within the heap of the current buffer.

        ssize_t offset = mCurrentPreviewFrame * mPreviewFrameSize;



        sp<MemoryHeapBase> heap = mHeap;

        sp<MemoryHeapBase> heap = mPreviewHeap;

    

        // this assumes the internal state of fake camera doesn't change

        // (or is thread safe)
@@ -187,6 +197,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)
@@ -237,10 +265,9 @@ int CameraHardwareStub::pictureThread() 
        // In the meantime just make another fake camera picture.

        int w, h;

        mParameters.getPictureSize(&w, &h);

        sp<MemoryHeapBase> heap = new MemoryHeapBase(w * 2 * h);

        sp<MemoryBase> mem = new MemoryBase(heap, 0, w * 2 * h);

        sp<MemoryBase> mem = new MemoryBase(mRawHeap, 0, w * 2 * h);

        FakeCamera cam(w, h);

        cam.getNextFrameAsYuv422((uint8_t *)heap->base());

        cam.getNextFrameAsYuv422((uint8_t *)mRawHeap->base());

        if (mRawPictureCallback)

            mRawPictureCallback(mem, mPictureCallbackCookie);

    }

camera/libcameraservice/CameraHardwareStub.h

+9 −1
Original line number Diff line number Diff line
@@ -30,10 +30,17 @@ namespace android { 
class CameraHardwareStub : public CameraHardwareInterface {

public:

    virtual sp<IMemoryHeap> getPreviewHeap() const;

    virtual sp<IMemoryHeap> getRawHeap() const;



    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,
@@ -87,7 +94,8 @@ private: 


    CameraParameters    mParameters;



    sp<MemoryHeapBase>  mHeap;

    sp<MemoryHeapBase>  mPreviewHeap;

    sp<MemoryHeapBase>  mRawHeap;

    sp<MemoryBase>      mBuffers[kBufferCount];



    FakeCamera          *mFakeCamera;