Merge commit '48ac68e1b117b6b55f06daced7d9d5d550853306' into gingerbread-plus-aosp
* commit '48ac68e1b117b6b55f06daced7d9d5d550853306':
Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
Merge commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf'
* commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf':
Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
Merge commit '04bc807057d1c336a5d1340595b790eee4c5b372'
* commit '04bc807057d1c336a5d1340595b790eee4c5b372':
Allow Bluetooth radio to be toggled in Airplane mode.
Merge commit '99fa510e67cb973b45fc216c75bdc817421e14ae' into gingerbread-plus-aosp
* commit '99fa510e67cb973b45fc216c75bdc817421e14ae':
Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
Merge commit '6659284d68bb04539891456700c8da2d0bae7d09' into gingerbread-plus-aosp
* commit '6659284d68bb04539891456700c8da2d0bae7d09':
Allow Bluetooth radio to be toggled in Airplane mode.
Merge commit '2382755730206da52b64bf7bd2fad421f9a6fd0d' into gingerbread-plus-aosp
* commit '2382755730206da52b64bf7bd2fad421f9a6fd0d':
Add a --debug-mode option to aapt.
Merge commit 'b7ab342016bd622b30e1945b16b24413ae82ac54'
* commit 'b7ab342016bd622b30e1945b16b24413ae82ac54':
GPS: Initialize XTRA support when GPS is enabled
GPS: Don't set XTRA download pending flag at boot time.
Merge commit 'aa40b834985023642b30fa2e0563c414a994bd3a'
* commit 'aa40b834985023642b30fa2e0563c414a994bd3a':
Add some encoding parameters for the "record" utility
Merge commit 'b1824cfca7dde367197662953b7478a9dbceab27'
* commit 'b1824cfca7dde367197662953b7478a9dbceab27':
fix the build. will revisit this change in a minute
Merge commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c'
* commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c':
fix the build. will revisit this change in a minute
Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp
* commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca':
Add some encoding parameters for the "record" utility
Merge commit '54901c9e8497b33bab1462245864e9dd119bb64c' into gingerbread-plus-aosp
* commit '54901c9e8497b33bab1462245864e9dd119bb64c':
fix the build. will revisit this change in a minute
This was causing stack stitching problems where a one-way call with
violations followed by a two-way call without violations was getting
the previous one-way call's violation stack stitched on to the second
caller's stack.
The solution is a little more indirect than I would've liked
(preserving the binder's onTransact flags until enforceInterface) but
was seemingly necessary to work without changing the AIDL compiler.
It should also be sufficiently cheap, since no new calls to
thread-local IPCThreadState lookups were required. The additional
work is just same-thread getter/setters on the existing
IPCThreadState.
Change-Id: I4b6db1d445c56e868e6d0d7be3ba6849f4ef23ae
Merge commit 'd6a5f2dff9c9db3e154a461127a7cfcea05c1f90'
* commit 'd6a5f2dff9c9db3e154a461127a7cfcea05c1f90':
Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
Merge commit 'd3e803ae28c369996f9acf6036ea99af5561949c' into gingerbread-plus-aosp
* commit 'd3e803ae28c369996f9acf6036ea99af5561949c':
Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
Merge commit '18551815e5a45f236f9898ce4abc9b99f5fc6ae4'
* commit '18551815e5a45f236f9898ce4abc9b99f5fc6ae4':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '77881293ad9a68dfa1c1da4b466f7b2b6465b342' into gingerbread-plus-aosp
* commit '77881293ad9a68dfa1c1da4b466f7b2b6465b342':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '1577e629866b2700e31c9467478e05ebffcc69a1'
* commit '1577e629866b2700e31c9467478e05ebffcc69a1':
fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d' into gingerbread-plus-aosp
* commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d':
Fix doc link in InputDevice.
Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp
* commit '12006013cc2cd0a076855ed068f5f782b24631c3':
fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68' into gingerbread-plus-aosp
* commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68':
New edge effects for scrolling widgets (overscroll)
