am a9522673: stagefright: move ARRAY_SIZE to foundation

* commit 'a9522673f3076ea937eb2912945d7ed646ca05df':
  stagefright: move ARRAY_SIZE to foundation
am 7f04ec2a: Merge "audio policy: add support for USB devices for voice call" into lmp-dev

* commit '7f04ec2a4ec94ada7ef89db8c50fd1e5c3a93a3b':
  audio policy: add support for USB devices for voice call
am c80863e9: Merge "Revert "NuPlayer: don\'t feed decoder input data during flushing." " into lmp-dev

* commit 'c80863e922cb94122b783ef31ce18cf58471f546':
  Revert "NuPlayer: don't feed decoder input data during flushing."
Merge "Camera: Need consider AF state for ZSL buffer selection" into lmp-dev
delay data source creation for GenericSource prepare time

Bug: 16708180

Change-Id: I9d578ef5e2edaed50279d28d3831c68556468f39
Merge "delay data source creation for GenericSource prepare time" into lmp-dev
Clarify and implement MediaCodec status codes

Clarify MediaCodec status codes in MediaError.h
When appropriate, return OMX error codes for status.
Optionally return a status code from CreateByType() and
CreateByComponentName().

Bug: 12034929
Bug: 13976475
Change-Id: I7463dd08d101074f730481b26127a69c9186c97e
Merge "Clarify and implement MediaCodec status codes" into lmp-dev
Fix effect and mono sink handling.

Do not permit mixing to mono sink in AudioFlinger.
Allow effects on mono sink if not Mixer thread (e.g. Record).

Bug: 16863095
Change-Id: I8b232fc1fb3f07bf017020c5d4f9ace644dec6d8
Merge "Fix effect and mono sink handling." into lmp-dev
Revert "NuPlayer: don't feed decoder input data during flushing."

The previous patch results in MediaBuffer leakage.

This reverts commit 69a85b792c31033a99c8858e3b1a3c2ea68b6278.

Bug: 14955925
Bug: 16303659
Bug: 16467066
Bug: 16849601
Change-Id: Ib1892b7603a97e12b7ee228fd5a4009700cdc988
stagefright: add AString parceling, and equal/compareIgnoreCase

Bug: 11990470
Change-Id: If43ada5d2e768931f4409e499eaa268edade0500
am 07574544: Merge "Fix build after side-stepping global -Bsymbolic."

* commit '07574544bda57f4227c7eadf5682f7bf86e42b26':
  Fix build after side-stepping global -Bsymbolic.
camera: Allow Camera#getParameters to be called by mediaserver anytime

This fixes a crash if the camera was locked by the media recorder and
another process tried to get the legacy parameters (for the camera
characteristics).

Bug: 16695955
Change-Id: I945a16a686a6987150c8754b5296353e76e5afa0
Resolved conflicts for merge of 2af8711d to lmp-dev-plus-aosp

Change-Id: I016dbca0318998f17fc741f873589c414774e7ff
stagefright: rework media codec list and infos

This is in preparation of serving the codec list and codec infos
from the mediaserver

Bug: 11990470
Change-Id: Ib8e2708679c9ce461a4ba179974a740cdcdf2731
media/playerservice: add getCodecList() to MediaPlayerService

Bug: 11990470
Change-Id: I8fa45946fd9b76f9b975fc59062819c57e6881ef
stagefright: support flexible YUV format

- Report flexible format for standard OMX formats that are flexible.
- Accept flexible format when specifying video port formats.

Bug: 10706245
Change-Id: I9e82bc895bb0d5d606eb05fdf83bec766eaa2046
am 3659445a: Merge "Camera: Need consider AF state for ZSL buffer selection" into lmp-dev

* commit '3659445a8b71afba9927b9d0d8ac41782278bde5':
  Camera: Need consider AF state for ZSL buffer selection
am 8accee4f: stagefright: add AString parceling, and equal/compareIgnoreCase

* commit '8accee4f0e94f19866d260be6eecd6c219eb4982':
  stagefright: add AString parceling, and equal/compareIgnoreCase