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

Commit 847b82d8 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 89bc1395: Merge "Add more error checking for ndc" into froyo 

Merge commit '89bc1395' into froyo-plus-aosp

* commit '89bc1395': (392 commits)
  Add more error checking for ndc
  Add javadoc for camera scene modes.
  more clean-up in preparation of bigger changes
  Fix a typo in Singleton<>
  Avoid copying for input recording frames in CameraSource
  Add video frame parameter.
  more clean-up of Surfaceflinger's client management
  Better sniffing of MPEG4 content by checking for a compatible sub-brand.
  Remove the logic in CameraSource using CameraParameters class to find out the buffer size.
  Add support for gps altitude EXIF tags.
  minor clean-up GLclampx -> GLclampf
  clean-up dead-code
  Make sure to use filtering while in fixed-size mode
  oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
  Avoid repeatedly allocating and freeing memory in CameraSource
  After failing to create an AudioTrack, only stop the source if we were the ones starting it.
  Convert a number of assertions into runtime errors (OggExtractor)
  fix [2712278] The preview buffer left some black borders in left and bottom edges
  Fix 2667859: change text back to default size
  Support for thumbnail extraction in the Matroska extractor.
  ...
parents 8799cdfb 89bc1395

Android.mk

+10 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ LOCAL_JAVA_LIBRARIES := core ext 
LOCAL_MODULE := framework

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



LOCAL_NO_EMMA_INSTRUMENT := true

LOCAL_NO_EMMA_COMPILE := true



# List of classes and interfaces which should be loaded by the Zygote.

LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes
@@ -345,6 +348,10 @@ framework_docs_LOCAL_SRC_FILES := \ 
	$(call find-other-java-files, $(dirs_to_document)) \

	$(call find-other-html-files, $(html_dirs))



# This is used by ide.mk as the list of source files that are

# always included.

INTERNAL_SDK_SOURCE_DIRS := $(addprefix $(LOCAL_PATH)/,$(dirs_to_document))



framework_docs_LOCAL_DROIDDOC_SOURCE_PATH := \

	$(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
@@ -592,6 +599,9 @@ LOCAL_JAVA_LIBRARIES := core 


LOCAL_MODULE := ext



LOCAL_NO_EMMA_INSTRUMENT := true

LOCAL_NO_EMMA_COMPILE := true



include $(BUILD_JAVA_LIBRARY)

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/app)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/FrameworkTest_intermediates/)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android.policy*)

$(call add-clean-step, rm -rf $(TARGET_OUT_JAVA_LIBRARIES)/android.policy.jar)





# ************************************************

api/9.xml

0 → 100644
+395736 −0

File added.

Preview size limit exceeded, changes collapsed.

api/current.xml

+4639 −0

File changed.

Preview size limit exceeded, changes collapsed.

camera/libcameraservice/Android.mk

+18 −15
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



#

# Set USE_CAMERA_STUB for non-emulator and non-simulator builds, if you want

# the camera service to use the fake camera.  For emulator or simulator builds,

# we always use the fake camera.

# Set USE_CAMERA_STUB if you don't want to use the hardware camera.



ifeq ($(USE_CAMERA_STUB),)

USE_CAMERA_STUB:=false

# force these builds to use camera stub only

ifneq ($(filter sooner generic sim,$(TARGET_DEVICE)),)

  USE_CAMERA_STUB:=true

endif #libcamerastub

endif



ifeq ($(USE_CAMERA_STUB),true)

  INCLUDE_CAMERA_STUB:=true

  INCLUDE_CAMERA_HARDWARE:=false

else

  INCLUDE_CAMERA_STUB:=true  # set this to true temporarily for testing

  INCLUDE_CAMERA_HARDWARE:=true

endif



ifeq ($(INCLUDE_CAMERA_STUB),true)

#

# libcamerastub

#
@@ -32,7 +35,7 @@ endif 
LOCAL_SHARED_LIBRARIES:= libui



include $(BUILD_STATIC_LIBRARY)

endif # USE_CAMERA_STUB

endif # INCLUDE_CAMERA_STUB



#

# libcameraservice
@@ -54,18 +57,18 @@ LOCAL_SHARED_LIBRARIES:= \ 


LOCAL_MODULE:= libcameraservice



LOCAL_CFLAGS += -DLOG_TAG=\"CameraService\"



ifeq ($(TARGET_SIMULATOR),true)

LOCAL_CFLAGS += -DSINGLE_PROCESS

endif



ifeq ($(USE_CAMERA_STUB), true)

ifeq ($(INCLUDE_CAMERA_STUB), true)

LOCAL_STATIC_LIBRARIES += libcamerastub

LOCAL_CFLAGS += -include CameraHardwareStub.h

else

LOCAL_CFLAGS += -DINCLUDE_CAMERA_STUB

endif



ifeq ($(INCLUDE_CAMERA_HARDWARE),true)

LOCAL_CFLAGS += -DINCLUDE_CAMERA_HARDWARE

LOCAL_SHARED_LIBRARIES += libcamera 

endif



include $(BUILD_SHARED_LIBRARY)