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.
Merge commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7' into gingerbread-plus-aosp
* commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7':
DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
Merge commit '042e9bd989d9c78e23ed29011b6532743f510625' into gingerbread-plus-aosp
* commit '042e9bd989d9c78e23ed29011b6532743f510625':
Add SIP related settings in the Settings.System.
Merge commit '361199b5e742c6635d4d7a03de6cf37b31cf442c' into gingerbread-plus-aosp
* commit '361199b5e742c6635d4d7a03de6cf37b31cf442c':
Add PackageManager API to get information about a provider component.
Merge commit '22cd420bfa431b4ad55e699afadf109dcc54f201' into gingerbread-plus-aosp
* commit '22cd420bfa431b4ad55e699afadf109dcc54f201':
Improve debug output when an ANR happens.
Merge commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp
* commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3':
Fixed single line state on TextView.
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 '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 '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 'd3e803ae28c369996f9acf6036ea99af5561949c' into gingerbread-plus-aosp
* commit 'd3e803ae28c369996f9acf6036ea99af5561949c':
Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
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 '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)
Finished the input device capability API.
Added a mechanism for calibrating touch devices to obtain more
accurate information about the touch contact area.
Improved pointer location to show new coordinates and capabilities.
Optimized pointer location display and formatting to avoid allocating large
numbers of temporary objects. The GC churn was causing the application to
stutter very badly when more than a couple of fingers were down).
Added more diagnostics.
Change-Id: Ie25380278ed6f16c5b04cd9df848015850383498
