Merge commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8' into gingerbread-plus-aosp
* commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread
* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Merge commit '42a18c09e7bb9c372382e88053409c25563ae7c9' into gingerbread-plus-aosp
* commit '42a18c09e7bb9c372382e88053409c25563ae7c9':
Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit 'cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp
* commit 'cd677a30851e4ba8b79a41c20e20220a81719378':
Remove hard-coded number of audio channels in AudioSource
Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp
* commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb':
Various improvements to battery stats collection
We now clear the battery stats when unplugging after the
battery is full. This allows us to use the "total" stats as
a new "since last charged" stat. Total is gone. I never used
it, it was worthless. Since last charged is a lot more
interesting.
The battery history now collects a lot more stats, and keeps
control over how much it can collect. Printing is now more
descriptive.
The kinds of stats have been renamed to SINCE_UNPLUGGED and
SINCE_DISCHARGED. The other two stats are still there, but
no longer printed; a future change will eliminate them
completely along with all of their state.
Change-Id: I4e9fcfcf8c30510092c76a8594f6021e9502fbc1
Merge commit 'c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp
* commit 'c95812e6cacaa14748c81323bac6561453991a24':
Move out all framework-tests classes.
that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be
presumed to require Bluetooth just because they take the permission.
Change-Id: Ia629e9ef0425a577e4e14f9b348f5aa2b39c1e74
Merge commit '92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp
* commit '92266a7894becc1cdf2298fd02380749ab036131':
More work in progress on native events.
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher. Also added some plumbing
that will be used to notify the framework about ANRs.
Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
Merge commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3' into gingerbread-plus-aosp
* commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3':
add new video/audio presence icons in the framework resource dirs, and make them public.
Merge commit '987e223df73abe6cca47d09fff3a87be0243a085' into gingerbread-plus-aosp
* commit '987e223df73abe6cca47d09fff3a87be0243a085':
Use the droidcore goal with dist-for-goals.
Merge commit '9a5fcd1c14dcea951099433885ed3519dee90f48' into gingerbread-plus-aosp
* commit '9a5fcd1c14dcea951099433885ed3519dee90f48':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into gingerbread
* commit '27357fc08802d796a6b6a1111ac5534d75fc8be7':
Use the droidcore goal with dist-for-goals.
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread
* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
- add definitions for
presence_video_away
presence_video_busy
presence_video_online
presence_audio_away
presence_audio_busy
presence_audio_online
in the public.xml, and update current.xml
- the actual icons for the audio versions are not yet done, so I used the video versions as placeholders.
Change-Id: I9e2be5dd05619cbdbbb61dc231e9da1984ddbb36
Merge commit 'ac8b0d47011293ef713f4996317bbda579354200' into gingerbread-plus-aosp
* commit 'ac8b0d47011293ef713f4996317bbda579354200':
This patch enables each omx instance to have a separate message dispatcher, and
Merge commit '0014296b1faca612134a1daa7f74dd82ed40cc2d' into gingerbread-plus-aosp
* commit '0014296b1faca612134a1daa7f74dd82ed40cc2d':
docs: add information about known issues in resource matching
Merge commit '457738e628ee4d165014996bcf4e8d1983ac5929' into gingerbread
* commit '457738e628ee4d165014996bcf4e8d1983ac5929':
docs: add information about known issues in resource matching
Merge commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c' into gingerbread-plus-aosp
* commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c':
Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
this is needed for backward compatibility with somewhat buggy applications.
not a big deal, since the app can request another format explicitely.
Change-Id: Ic73f8acedf94ffc0115637efac28fa8ffaa7e5a4
thus eliminates the sharing of the message dispatches between omx instances.
If the omx audio and video encoders share the same dispatcher, when the audio read
blocks in the AudioSource, the message dispatcher thread gets blocked. As a result,
the message for the omx video encoder can not be dispatched, hence gets blocked too.
If the blocking time is long enough, the video frame rate decreases significantly.
This is the case when we read 2048 bytes by default each time. Reading smaller blocks
of audio data helps mitigate the above-mentioned problem, but it is not an ideal
solution for two reasons: a) it is not efficient, and thus can cause a lot of overhead
passing buffers between the frame work and the omx encoders; b) also, the audio record
thread can overflow as a result, which lead to the loss of recorded audio frames.
This patch affects both authoring engine and the playback engine.
Change-Id: I26dfde7ac46c8752cf1793ce1bfcc7be7724580e
