tree 29ebe383d31d59495d55bbebe7008b110cf03d28
parent b30c68554ae427a17b8d2172352955b7a338f01a
parent f733ab6e153fb89f045bfb1cb2746bd58399a0c2
author David Ng <dave@codeaurora.org> 1449030611 -0800
committer David Ng <dave@codeaurora.org> 1449033959 -0800
mergetag object f733ab6e153fb89f045bfb1cb2746bd58399a0c2
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052354 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgIACgkQ6K0/gZqxDngy0ACfSFi0XfePXlN9rwgW3WYd7QOd
 IicAn1VOzuVLkeqTc9R1R7pPpn+lb5aS
 =zp1+
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26': (104 commits)
  ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
  AudioTrack: Prevent stop() from reissuing last marker event
  Check NAL size before use
  MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
  ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
  Don't crash when there's no conceal frame
  AudioSystem: Fix race condition in accessing ioDescriptors
  OMX: allow only secure codec to remotely call allocateBuffer.
  MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
  Camera3Device: Change HFR request thread priority to 1
  Camera3Device: Bookkeeping reprocess shutters separately
  CameraService: Use SCHED_FIFO for request queue thread in HFR
  CameraService: Use SCHED_FIFO for request queue thread in HFR
  DO NOT MERGE stagefright: fix AMessage::FromParcel
  stagefright: fix AMessage::FromParcel
  stagefright: fix AMessage::FromParcel
  SoftAVCDec: Reduced memory requirements
  AudioPolicyService: fix race in AudioCommandThread
  DO NOT MERGE - Fix build for commit 69ae6a87
  audio policy: fix preemtible capture race
  ...

Conflicts:
	media/libmedia/ICrypto.cpp
	media/libmedia/IEffect.cpp
	media/libmediaplayerservice/nuplayer/GenericSource.cpp
	media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
	media/libstagefright/DataSource.cpp
	media/libstagefright/OggExtractor.cpp
	media/libstagefright/data/media_codecs_google_video.xml
	media/libstagefright/include/OMXNodeInstance.h
	media/libstagefright/omx/OMXNodeInstance.cpp

Change-Id: I4e64767638a163004031d2ace602360119349bb5