Merge commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4' into gingerbread-plus-aosp
* commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4':
Fix a small bug when granting permissions through activity results.
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp
* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
Clean up some permissions.
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.
Also deprecate the activity API to go in the foreground. I didn't
realize that was released in the SDK. It needs to go away.
Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
Merge commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp
* commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1':
Improve messages when java process is starting.
The problem was that the time to receive an output buffer
from an audio encoder is different because the encoder does not
need to read from the source for all output buffers. This leads
to large fluctuation in terms of wall clock duration between two
neighboring audio sample outputs from the audio encoder. As a
result, the media time for the video track after adjustment using
the drifting changes wildly sometimes.
This patch addresses this issue by only updating the media drift
time when an audio source input buffer is read. the wall clock
for the audio track is also calculated at the same time when
the input audio buffer is read at AudioSource.
bug - 2959800
Change-Id: I3174aa182f744784b540f0a7198524d4eee8bd7b
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp
* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Previous changes only added javadoc annotation, but didn't apply
annotation to the source. Fixing this and updating current.xml.
Change-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab
Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp
* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
Add software features for SIP and VOIP
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.
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.
Merge commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp
* commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942':
Keep gtalk video chat specific code consistent with rtsp changes.
Merge commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d' into gingerbread-plus-aosp
* commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d':
Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
Merge commit '8f8fcfa319e0e0af14aa8f8555be58555703af02' into gingerbread-plus-aosp
* commit '8f8fcfa319e0e0af14aa8f8555be58555703af02':
Notifications are now light-on-dark in the windowshade.
The get/set for the pluginPath is leftover from the Gear's plugin
and is no longer useful now that plugins are loaded from their
own APK using the package manager. These methods were modified to
be no-ops in froyo, but the documentation was never completed.
Change-Id: I20f6593445d877a3dae9b9f51d5198a3509255d6
http://b/2811032
Finally.
This also fixes that little 1px gap that would occasionally
show through to the carbon fiber background (changed to
steel cord for now) between the last notification and the
windowshade's handlebar. It still gaps a little while you're
dragging, due to the asynchronous motion of the various
windows involved, but when the panel is still you shouldn't
see any background. (Man, that drove me crazy.)
Bug: 2949229
Change-Id: If085f4ab7dfb7c3868c30469661907d5d63f070b
