Merge commit 'e0c8545a2369881fe09582337a9de3db2db1a951'
* commit 'e0c8545a2369881fe09582337a9de3db2db1a951':
Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
Merge commit 'ab70a98b0ec450379fa953a9fe911109329b9c37'
* commit 'ab70a98b0ec450379fa953a9fe911109329b9c37':
DO NOT MERGE Adjust amount pull effects the glow and edge decay.
Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7'
* commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7':
Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
Merge commit '5dcf588a81a59142985736d8bb0430586f68ec08'
* commit '5dcf588a81a59142985736d8bb0430586f68ec08':
Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
Merge commit '14ea1048e7e8a4b40836b5601bc86b91663525cb'
* commit '14ea1048e7e8a4b40836b5601bc86b91663525cb':
Disable the access unit timeout temporarily while a seek operation is in progress.
Merge commit 'bd1454f5005619b69d887fee6a7a4891b3323d18' into gingerbread-plus-aosp
* commit 'bd1454f5005619b69d887fee6a7a4891b3323d18':
Include debugger connection status in error entry
Merge commit '2f77c3e4de3d68904a6a872d53283775b3a5c349' into gingerbread-plus-aosp
* commit '2f77c3e4de3d68904a6a872d53283775b3a5c349':
GPS: Fix another race condition in GPS HAL initialization
Merge commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5' into gingerbread-plus-aosp
* commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5':
bug:3082865 don't use IN to construct sql to delete downloads
Merge commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d' into gingerbread-plus-aosp
* commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d':
Fallback to SharedPreferences$Editor.commit() when no apply() exists.
Merge commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d' into gingerbread-plus-aosp
* commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d':
Avoid pre-processing images when they won't be used
Merge commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32' into gingerbread-plus-aosp
* commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32':
Added more robust tracking and cancelation of events.
This change fixes several issues where events would be dropped in the
input dispatch pipeline in such a way that the dispatcher could not
accurately track the state of the input device.
Given more robust tracking, we can now also provide robust cancelation
of input events in cases where an application might otherwise become
out of sync with the event stream due to ANR, app switch, policy decisions,
or forced focus transitions.
Pruned some of the input dispatcher log output.
Moved the responsibility for calling intercept*BeforeQueueing into
the input dispatcher instead of the input reader and added support for
early interception of injected events for events coming from trusted
sources. This enables behaviors like injection of media keys while
the screen is off, haptic feedback of injected virtual keys, so injected
events become more "first class" in a way.
Change-Id: Iec6ff1dd21e5f3c7feb80ea4feb5382bd090dbd9
Merge commit '77880ae4187d92506848249585687fc9d0c0dd25'
* commit '77880ae4187d92506848249585687fc9d0c0dd25':
SipService: add permission check for using API
Merge commit '66e606040a521b81033ff75025620436c050c82e' into gingerbread-plus-aosp
* commit '66e606040a521b81033ff75025620436c050c82e':
GPS: More HAL initialization cleanup
- Register buffers with Gralloc when unflattening a GraphicBuffer (rather than
doing it in the Surface class).
- Add support for a GraphicBuffer that wraps an android_native_window_t*.
Change-Id: I029ac086111bbac800e5ca37eb505f558b718cd8
Merge commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56'
* commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56':
DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.
Merge commit '6c4609ada4526eea2fca4eef043d27dd07026e0a'
* commit '6c4609ada4526eea2fca4eef043d27dd07026e0a':
DO NOT MERGE Only show edge glow effect on 1 side at a time.
Merge commit '4b7ff734611666a68471c97fabb6f516efab25cd'
* commit '4b7ff734611666a68471c97fabb6f516efab25cd':
Suppress harder for echo without affecting the volume of real voice.
Merge commit 'f10929fb350395c21edd2cba7641479afe75e750'
* commit 'f10929fb350395c21edd2cba7641479afe75e750':
Minor fix for InputReader support for non-touchscreen devices.
Merge commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe'
* commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe':
DO NOT MERGE Only show edge glow effect on 1 side at a time.
Merge commit 'd185494da653d1d0e4f20d28c2dd53764994fc3f'
* commit 'd185494da653d1d0e4f20d28c2dd53764994fc3f':
Port mock ril controller and tests to GB. DO NOT MERGE
