Merge commit '1e1a030b502acae11dbd11d826d389351910a60f'
* commit '1e1a030b502acae11dbd11d826d389351910a60f':
Can't have two rules building the stubs and public.xml!
- Fixed click when re-enabling effect during the turn off phase:
make sure the effect states where effect is processed are the same
where volume control is delegated to effect.
- Fixed click when effect is deleted while still active: do not apply
volume ramp if an effect having volume control was just removed from the
effect chain.
Also fixed a crash when PCM dump is enabled in effect bundle wrapper.
Change-Id: Ib562f5cf75c69af75df0e862536262e2514493e4
Merge commit '47471175c9d19a00d06a77aa316dcda08be97deb' into gingerbread-plus-aosp
* commit '47471175c9d19a00d06a77aa316dcda08be97deb':
Can't have two rules building the stubs and public.xml!
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.
Add "bluetooth" to the list of toggleable radios. Because this string
is in the Settings DB, I had to bump the version number. Why is this in
the settings DB anyway, rather than a carrier config option?
I also discovered that the SystemUI package copied the entire contents of
res/values/defaults.xml from SettingsProvider, when I originally tried
to update the unreferenced SystemUI version of the setting. To prevent
future confusion, I removed all of the values from the SystemUI version
of res/values/defaults.xml.
Change-Id: Ib8a75c85b9db5c1963b65538ee2765d5087e67d2
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.
Methods in BluetoothTestUtils remain the same as they were in
BluetoothStressTest except for the constructor and close(). The constructor
is derived from setUp() and close() from tearDown().
Change-Id: Ib472878fee2aa1b678e8ee6743cac2373eb7507f
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"
This reverts commit fd04143a47770256dabcfa4d8447127b3ec8b2bf.
This break most automated tests because with this change, if the
device is fully charged, it will simply turn off the screen, regardless
if USB is connected to hsot PC or not; so for our tests, most of them
are always connected to host PC, and fully charged 99% of the time,
as soon as the screen turns off, the front-end test Activity will be
suspended.
Change-Id: I1e6590611af43812f1bac223dd31570d1d90cfc5
