Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0'
* commit 'd6d83279183db749de07bfdac79fe4180fc848d0':
SIP: longer timeout for making call, shorter for cancelling
Merge commit '888bcdbeca34819c07d7dc06dc03d91207aea0c0'
* commit '888bcdbeca34819c07d7dc06dc03d91207aea0c0':
Add new Alarm provider class for setting an alarm.
Merge commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34'
* commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34':
Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp
* commit '194bbcce9ba15634500f542b9ea017b2cf154b45':
SIP: longer timeout for making call, shorter for cancelling
screenshots are taken using ISurfaceComposer::captureScreen() which returns
the size of the screenshot and an IMemoryHeap containing the data.
screenshots have limitations:
- they will always fail if a secure window is up on screen
- require GL_OES_framebuffer_object extension
- in some situation, video planes won't been captured
Change-Id: I741c68a2d2984fb139039301c3349e6780e2cd58
Merge commit '52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp
* commit '52f58e96a723a56e6619c237c814a07503745de9':
fix problem in AudioEffect JNI setup.
There is a problem in AudioEffect and Visualizer native_setup() methods
that causes a crash in the application after the mediaserver process
has crashed and restarted.
The problem is that the native AudioEffect/Visualizer constructor is
called while the JNI is in critical state after calling
GetPrimitiveArrayCritical(). As the mediaserver process just restarted, the
first call to AudioSystem will cause the binder IAudioflinger interface to
be reteived and a callback send to AudioSystem JNI to clear the mediaserver
error state. This will call env->FindClass() and crash due to the JNI being
in critical state.
Also fixed a similar problem in AudioTrack JNI
Change-Id: I4a9026a3e26c7f78d9b4b4bec1aac90fbee2ab62
Merge commit '0cd28fdd16ac140d024953c7a076ffb3ec82c8b2' into gingerbread-plus-aosp
* commit '0cd28fdd16ac140d024953c7a076ffb3ec82c8b2':
Use the default SecureRandom provider.
- New feature to "am monitor" to have it automatically launch
gdbserv for you when a crash/ANR happens, and tell you how to
run the client.
- Update dumpstate to match new location of binder debug logs
- Various commented out logs that are being used to track down
issues.
Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
Don't be tricky when trying to set the seed for the secure
random number generator. Setting the seed manually eliminates
the internal randomization the SecureRandom class does automatically,
reducing randomness. Just use the default seed, which is designed
to be safe.
Change-Id: I5747c2b3a10cf04e33d2202195951ed5cb82b2fe
Merge commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a' into gingerbread-plus-aosp
* commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a':
Add new Alarm provider class for setting an alarm.
Merge commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9' into gingerbread-plus-aosp
* commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9':
Add locking around ZIP seeking
Merge commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6' into gingerbread-plus-aosp
* commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6':
Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
Merge commit '8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp
* commit '8f97fe551e7bd95abf395eed303b975eaa8f0158':
Move long Connectivity tasks to handler thread.
Merge commit '4318ab058629b701e225bb7ead9dd2b229c9354b' into gingerbread-plus-aosp
* commit '4318ab058629b701e225bb7ead9dd2b229c9354b':
Import revised translations. DO NOT MERGE
The new class provides static variables for creating an intent to broadcast to
applications implementing the alarm clock. A new permission has been added and
applications are recommended to require this permission if accepting the set
alarm broadcast.
Change-Id: I7b1014acdc54371cbda19bcf9b5c395b647aa413
