DO NOT MERGE: CameraService: Fix permissions check issues

Bug: 15677063
Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
camera: allow device to append camera parameters

Overload using include/camera/CameraParametersExtra.h in device
tree to add device specific camera parameters.

Change-Id: Ie79380f4e49661348df4b2028ddf48daa67fca2d
media: Match quality definitions with what the framework expects

These ids are used internally in order to parse the media codecs
quality definitions and pass them along to the frameworks/base component.

These ids must match the ones present in f/b/media/java/android/media/CamcorderProfile.java

If the hardware is a qualcomm, the match if OK. Otherwise though, they are
off-by-one which causes crashes in the camera app when selecting a low
resolution.

Change-Id: Ife21a49314fee687d70f90deb618c6b138601d96
libstagefright: Make timed text for audio only files work on start

The basic problem is for an audio-only track adding the subtitle track through
the Android api does not kick off the text driver when you call start

Change-Id: I86d206551fa783c225c1867122148c68ef41404a
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_av into cm-11.0

Conflicts:
	camera/CameraParameters.cpp
	include/camera/CameraParameters.h

	modified:   camera/CameraParameters.cpp
	modified:   include/camera/CameraParameters.h
	new file:   include/camera/CameraParametersExtra.h
	modified:   include/media/MediaProfiles.h
	modified:   media/libstagefright/AwesomePlayer.cpp
	modified:   services/camera/libcameraservice/CameraService.cpp

Change-Id: I2bb7742aea1674040f2f655a723865fcb3c99f74
New av patches by Meticulus (testing)

Conflicts:
	camera/CameraParameters.cpp
	include/camera/CameraParameters.h
	include/media/stagefright/OMXCodec.h
	media/libstagefright/ACodec.cpp
	media/libstagefright/CameraSource.cpp
	media/libstagefright/OMXClient.cpp
	media/libstagefright/OMXCodec.cpp
	media/libstagefright/colorconversion/ColorConverter.cpp

	modified:   camera/CameraParameters.cpp
	modified:   cmds/stagefright/recordvideo.cpp
	modified:   include/camera/CameraParameters.h
	modified:   include/media/stagefright/ColorConverter.h
	modified:   include/media/stagefright/DataSource.h
	modified:   include/media/stagefright/MediaDefs.h
	modified:   include/media/stagefright/MediaErrors.h
	modified:   include/media/stagefright/MetaData.h
	modified:   include/media/stagefright/OMXCodec.h
	modified:   include/media/stagefright/SurfaceMediaSource.h
	modified:   include/media/stagefright/foundation/ABitReader.h
	modified:   media/libmedia/AudioTrack.cpp
	modified:   media/libmediaplayerservice/StagefrightRecorder.cpp
	modified:   media/libstagefright/ACodec.cpp
	modified:   media/libstagefright/AVIExtractor.cpp
	modified:   media/libstagefright/Android.mk
	modified:   media/libstagefright/AwesomePlayer.cpp
	modified:   media/libstagefright/CameraSource.cpp
	modified:   media/libstagefright/DataSource.cpp
	modified:   media/libstagefright/MPEG4Extractor.cpp
	modified:   media/libstagefright/MPEG4Writer.cpp
	modified:   media/libstagefright/MediaDefs.cpp
	modified:   media/libstagefright/MediaExtractor.cpp
	modified:   media/libstagefright/OMXClient.cpp
	modified:   media/libstagefright/OMXCodec.cpp
	modified:   media/libstagefright/SampleTable.cpp
	modified:   media/libstagefright/StagefrightMetadataRetriever.cpp
	modified:   media/libstagefright/SurfaceMediaSource.cpp
	modified:   media/libstagefright/colorconversion/ColorConverter.cpp
	modified:   media/libstagefright/foundation/ABitReader.cpp
	modified:   media/libstagefright/include/AVIExtractor.h
	modified:   media/libstagefright/include/SampleTable.h
	modified:   media/libstagefright/mpeg2ts/ESQueue.cpp
	modified:   media/libstagefright/mpeg2ts/ESQueue.h
	modified:   media/libstagefright/omx/SoftOMXPlugin.cpp
	modified:   media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
	modified:   media/libstagefright/tests/Android.mk

Change-Id: I348631ffb5c1b404a819b41f9574a2dfec06d1e8
missing Meticulus's files