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

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

Merge commit 'korg/cupcake' 

Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
parents d91450e1 3f2fd987

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@ LOCAL_SRC_FILES += \ 
	telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \

	telephony/java/com/android/internal/telephony/gsm/ISimPhoneBook.aidl \

	telephony/java/com/android/internal/telephony/gsm/ISms.aidl \

	wifi/java/android/net/wifi/IWifiManager.aidl

	wifi/java/android/net/wifi/IWifiManager.aidl \

	telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl



# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk

LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)

api/3.xml

+3 −3
Original line number Diff line number Diff line
@@ -125608,7 +125608,7 @@ 
 native="false"

 synchronized="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -125652,7 +125652,7 @@ 
 native="false"

 synchronized="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -125665,7 +125665,7 @@ 
 native="false"

 synchronized="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

api/current.xml

+752 −293

File changed.

Preview size limit exceeded, changes collapsed.

camera/libcameraservice/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ LOCAL_SRC_FILES:= \ 
LOCAL_SHARED_LIBRARIES:= \

    libui \

    libutils \

    libcutils

    libcutils \

    libmedia



LOCAL_MODULE:= libcameraservice

camera/libcameraservice/CameraService.cpp

+49 −0
Original line number Diff line number Diff line
@@ -28,8 +28,12 @@ 
#include <utils/MemoryHeapBase.h>

#include <ui/ICameraService.h>



#include <media/mediaplayer.h>

#include <media/AudioSystem.h>

#include "CameraService.h"



#include <cutils/properties.h>



namespace android {



extern "C" {
@@ -151,6 +155,25 @@ void CameraService::removeClient(const sp<ICameraClient>& cameraClient) 
    }

}



static sp<MediaPlayer> newMediaPlayer(const char *file) 

{

    sp<MediaPlayer> mp = new MediaPlayer();

    if (mp->setDataSource(file) == NO_ERROR) {

        char value[PROPERTY_VALUE_MAX];

        property_get("ro.camera.sound.forced", value, "0");

        if (atoi(value)) {

            mp->setAudioStreamType(AudioSystem::ENFORCED_AUDIBLE);

        } else {

            mp->setAudioStreamType(AudioSystem::SYSTEM);            

        }

        mp->prepare();

    } else {

        mp.clear();

        LOGE("Failed to load CameraService sounds.");

    }

    return mp;

}



CameraService::Client::Client(const sp<CameraService>& cameraService,

        const sp<ICameraClient>& cameraClient, pid_t clientPid)

{
@@ -161,6 +184,9 @@ CameraService::Client::Client(const sp<CameraService>& cameraService, 
    mHardware = openCameraHardware();

    mUseOverlay = mHardware->useOverlay();



    mMediaPlayerClick = newMediaPlayer("/system/media/audio/ui/camera_click.ogg");

    mMediaPlayerBeep = newMediaPlayer("/system/media/audio/ui/VideoRecord.ogg");



    // Callback is disabled by default

    mPreviewCallbackFlag = FRAME_CALLBACK_FLAG_NOOP;

    LOGD("Client X constructor");
@@ -265,6 +291,15 @@ CameraService::Client::~Client() 
#endif

    }



    if (mMediaPlayerBeep.get() != NULL) {

        mMediaPlayerBeep->disconnect();

        mMediaPlayerBeep.clear();

    }

    if (mMediaPlayerClick.get() != NULL) {

        mMediaPlayerClick->disconnect();

        mMediaPlayerClick.clear();

    }



    // make sure we tear down the hardware

    mClientPid = IPCThreadState::self()->getCallingPid();

    disconnect();
@@ -464,6 +499,10 @@ status_t CameraService::Client::startPreview() 


status_t CameraService::Client::startRecording()

{

    if (mMediaPlayerBeep.get() != NULL) {

        mMediaPlayerBeep->seekTo(0);

        mMediaPlayerBeep->start();

    }

    return startCameraMode(CAMERA_RECORDING_MODE);

}
@@ -502,6 +541,10 @@ void CameraService::Client::stopRecording() 
        return;

    }



    if (mMediaPlayerBeep.get() != NULL) {

        mMediaPlayerBeep->seekTo(0);

        mMediaPlayerBeep->start();

    }

    mHardware->stopRecording();

    LOGV("stopRecording(), hardware stopped OK");

    mPreviewBuffer.clear();
@@ -698,6 +741,12 @@ void CameraService::Client::shutterCallback(void *user) 
        return;

    }



    // Play shutter sound.

    if (client->mMediaPlayerClick.get() != NULL) {

        client->mMediaPlayerClick->seekTo(0);

        client->mMediaPlayerClick->start();

    }



    // Screen goes black after the buffer is unregistered.

    if (client->mSurface != 0 && !client->mUseOverlay) {

        client->mSurface->unregisterBuffers();