Merge commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6'
* commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6':
Fix logic error in downgrade of system apps
Merge commit '6fb81376b6e062d9b0ce4d91e23c2a88572b8186'
* commit '6fb81376b6e062d9b0ce4d91e23c2a88572b8186':
DO NOT MERGE Integrate edge effects into WebView.
Merge commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef' into gingerbread-plus-aosp
* commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef':
Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
Merge commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3' into gingerbread-plus-aosp
* commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3':
Make sure that if initialization fails, AudioSource still behaves well.
Fixes part of emulator which isn't telling us about dns servers.
Gets some stuff running, but browser is still broken.
bug:2961703
Change-Id: I53b946eba434aca1bb524c2acaf77922377948d1
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp
* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
Adding a feature definition corresponding to support for Near-Field
Merge commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7' into gingerbread-plus-aosp
* commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7':
Fix logic error in downgrade of system apps
setuid() and family can fail. Check return values to make
sure this doesn't happen unexpectedly.
Also call setgid() to drop root group permissions.
Change-Id: Id06fbe6239e2ed2fe23368695e333514e0581e6d
A logic error would allow not deleting data when uninstalling a system
app upgrade that's of a newer release than the on on the system
partition. If the system app had a database upgrade and this happened,
you might be in trouble.
Luckily it appears no one ever does this in code. You'd have to manually
get there doing:
adb uninstall -k updated.system.package
Change-Id: I3110fedf2d147975a0635c71898d985dd642a2c1
Merge commit 'e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp
* commit 'e34fe69e66d8c9bc76453347ba84261b060300f3':
DO NOT MERGE Integrate edge effects into WebView.
A few lines down "ps" is run through a null check, so apparently there
could be some screwy system conditions where this is encountered. And,
in fact, this was encountered through an updated system pacakge that
managed to delete the package from /system/app during testing. It left
the PackageSetting in mDisabledSysPackages which would cause a deference
of a null variable.
Change-Id: Ic7faca569abd16a87a8a69c20df08c11a274a001
Merge commit '6c33904ad948cb64245fbc5950c839e4d9e56de3' into gingerbread-plus-aosp
* commit '6c33904ad948cb64245fbc5950c839e4d9e56de3':
Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
