Merge branch 'master' into froyo-release (8a0eb53d) · Commits · e / os / android_frameworks_native-old

calendar/Android.mk

deleted100644 → 0

+0 −17

Original line number	Diff line number	Diff line
		# Copyright 2009 Google, Inc.

		LOCAL_PATH := $(call my-dir)

		include $(CLEAR_VARS)
		LOCAL_MODULE := calendar
		LOCAL_SRC_FILES := \
		../core/java/android/provider/Calendar.java \
		../core/java/android/pim/EventRecurrence.java \
		../core/java/android/pim/ICalendar.java \
		../core/java/android/pim/RecurrenceSet.java \
		../core/java/android/pim/ContactsAsyncHelper.java \

		include $(BUILD_STATIC_JAVA_LIBRARY)

		# Include this library in the build server's output directory
		$(call dist-for-goals, droid, $(LOCAL_BUILT_MODULE):calendar.jar)

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,4 +23,6 @@ LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := $(call all-java-files-under, src)
		LOCAL_STATIC_JAVA_LIBRARIES := android-common

		LOCAL_PROGUARD_ENABLED := disabled

		include $(BUILD_PACKAGE)

+6 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,12 @@ String8 AudioStreamInDump::getParameters(const String8& keys)
		return param.toString();
		}

		unsigned int AudioStreamInDump::getInputFramesLost() const
		{
		if (mFinalStream != 0 ) return mFinalStream->getInputFramesLost();
		return 0;
		}

		status_t AudioStreamInDump::dump(int fd, const Vector<String16>& args)
		{
		if (mFinalStream != 0 ) return mFinalStream->dump(fd, args);

+1 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ public:
		virtual status_t standby();
		virtual status_t setParameters(const String8& keyValuePairs);
		virtual String8 getParameters(const String8& keys);
		virtual unsigned int getInputFramesLost() const;
		virtual status_t dump(int fd, const Vector<String16>& args);
		void Close(void);
		AudioStreamIn* finalStream() { return mFinalStream; }

+20 −0

Original line number	Diff line number	Diff line
		@@ -618,6 +618,21 @@ size_t AudioFlinger::getInputBufferSize(uint32_t sampleRate, int format, int cha
		return mAudioHardware->getInputBufferSize(sampleRate, format, channelCount);
		}

		unsigned int AudioFlinger::getInputFramesLost(int ioHandle)
		{
		if (ioHandle == 0) {
		return 0;
		}

		Mutex::Autolock _l(mLock);

		RecordThread *recordThread = checkRecordThread_l(ioHandle);
		if (recordThread != NULL) {
		return recordThread->getInputFramesLost();
		}
		return 0;
		}

		status_t AudioFlinger::setVoiceVolume(float value)
		{
		// check calling permissions
		@@ -3575,6 +3590,11 @@ void AudioFlinger::RecordThread::readInputParameters()
		mRsmpInIndex = mFrameCount;
		}

		unsigned int AudioFlinger::RecordThread::getInputFramesLost()
		{
		return mInput->getInputFramesLost();
		}

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

		int AudioFlinger::openOutput(uint32_t *pDevices,