Merge commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206' into eclair-mr2-plus-aosp
* commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206':
Add htm and html extensions to the map as "text/html"
Merge commit '9e11f12664c917d3bb6bb1550e1f65414ad67729'
* commit '9e11f12664c917d3bb6bb1550e1f65414ad67729':
docs: fix doc error in dialog example snippet (no not merge)
Merge commit 'dbdc5e15a3d338048dd5b98af463b1857536e4c6' into eclair-mr2-plus-aosp
* commit 'dbdc5e15a3d338048dd5b98af463b1857536e4c6':
docs: fix doc error in dialog example snippet (no not merge)
Merge commit '445c05c4849c960bb43f73a0390e62dc73991da6' into eclair-mr2
* commit '445c05c4849c960bb43f73a0390e62dc73991da6':
docs: fix doc error in dialog example snippet (no not merge)
Merge commit 'f3bc5349b20f642f798c2b96d7bf7c05c2af998f' into eclair
* commit 'f3bc5349b20f642f798c2b96d7bf7c05c2af998f':
docs: fix doc error in dialog example snippet (no not merge)
Merge commit '1705d87b7e576bcd3bdc670411511376b4e245c5'
* commit '1705d87b7e576bcd3bdc670411511376b4e245c5':
A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
Merge commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d'
* commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d':
1) Add 10 seconds wait time before collecting the end memory.
Merge commit 'e5af55a84f472cf1a68dade6300a41282325db96'
* commit 'e5af55a84f472cf1a68dade6300a41282325db96':
Fix bug exposed by filmstrip. The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
Merge commit 'bfea1e139683cdb339e0cb6aa5970b5334369d77' into eclair-mr2-plus-aosp
* commit 'bfea1e139683cdb339e0cb6aa5970b5334369d77':
A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
Merge commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f' into eclair-mr2-plus-aosp
* commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f':
1) Add 10 seconds wait time before collecting the end memory.
Merge commit '12751251cfdccb307117ae87543db6959f7807c7' into eclair-mr2-plus-aosp
* commit '12751251cfdccb307117ae87543db6959f7807c7':
Fix bug exposed by filmstrip. The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
This change is likely incomplete and perhaps not right in other ways.
The gist of the change is that the span can return the number of lines
to which to apply the "leading margin".
Some specific things that should be looked at:
1) if the user has nested multiple
LeadingMarginSpans then they will inherit the "line count" feature.
This is wrong but I didn't want to spend time fixing it until it
was clear that this overall approach was acceptible.
2) The units for how many lines should indented is "lines" rather than
something like dips.
3) I wasn't sure what our strategy was for binary compatibility so
I didn't want to modify the methods in LeadingMarginSpan. Instead I
made another interface with extends LeadingMarginSpan that has the
extra method to return the line count.
Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-mr2
* commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007':
1) Add 10 seconds wait time before collecting the end memory.
Merge commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac' into eclair-mr2
* commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac':
Fix bug exposed by filmstrip. The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
This change will reduce the occurence rate of A2DP sink suspend resume failures observed in issues 2184627, 2181005 and possibly 2189628.
More robust suspend/resume logic.
Use only the suspend request to audio hardware to avoid having two concurent suspend resume control paths.
Merge commit '1ed0e43dac155db048ccc9152dc9425506099957'
* commit '1ed0e43dac155db048ccc9152dc9425506099957':
fix [2187212] add support for GLESv2 dispatch based on TLS
* changes:
Fix bug exposed by filmstrip. The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
Merge commit '93942a5bbc27fe569d370b57a0c3137f6c4171f7' into eclair-mr2-plus-aosp
* commit '93942a5bbc27fe569d370b57a0c3137f6c4171f7':
fix [2187212] add support for GLESv2 dispatch based on TLS
Merge commit '69fba87ac16d1c10da81fc3213ae169c755797f4' into eclair-mr2
* commit '69fba87ac16d1c10da81fc3213ae169c755797f4':
fix [2187212] add support for GLESv2 dispatch based on TLS
Merge commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d' into eclair-mr2-plus-aosp
* commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d':
Reimplement the OMX backend for stagefright.
* changes:
do not merge Return valid package info for packages that have been uninstalled with an option to retain data and resources using the flag GET_UNINSTALLED_PACKAGES These packages do not have a package setting. just check the flag and return the required info from PackageParser.generatePackageInfo
Merge commit '055e4ea56c42e714dc471d86311f64437f4ed786' into eclair-mr2-plus-aosp
* commit '055e4ea56c42e714dc471d86311f64437f4ed786':
fix grammar in the grant permissions UI
Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.
Changed APIs to conform to the rest of the system.
* Fixes#2192935
* Exchange attachment handling depends on MimeTypeMap to determine the
mime type of attachments based on their file extension
Change-Id: I44bbc36d7a5aa0800f072553274346d4547f8d4c
