Merge commit '25af9997b91a2cc5de8ffdaff072552492fb6312'
* commit '25af9997b91a2cc5de8ffdaff072552492fb6312':
Keep track of remaining fd when devices are removed
This change makes the window manager pass the currently displayed
orientation to the WindowOrientationListener each time to calls to get
the currently sensed orientation. Now, when the
WindowOrientationListener doesn't know for sure what the orientation
of the device should be (for example, if the sensed orientation is
flat on a table), then it trusts the already-displayed orientation,
rather than trusting whatever sensors reading it most recently
received.
The main use case this addresses is:
* user uses device in portrait
* user turns off device, puts it in pocket
* while in pocket, screen gets turned on, activating orientaiton
sensor, which senses landscape orientation
* screen timed out
* user takes device out, places it on a table (or looks down at it,
holding it flat), and unlocks it
Previously, when the device was unlocked, the
WindowOrientationListener would return landscape orientation based on
its previous sensor readings. Now, it will override those previous
readings because it knows they never actually took effect and the
device is presently flat.
This change also slightly modifies the way we handle flat orientation,
now completely ignoring data when the tilt distrust is nonzero (even
if the current sensor reading shows non-tilted).
Change-Id: Ia4950a41827f8c53a80487d0c2e83b556df781b9
Merge commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9'
* commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9':
Document that autoFocus must be called in auto and macro mode.
Merge commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58'
* commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58':
Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
Merge commit '0899e8bc9dc44249d6be016bed71a9ecee56f132'
* commit '0899e8bc9dc44249d6be016bed71a9ecee56f132':
Fix up handling of null fields in DownloadManager.
Merge commit '16848a15bbb7648bb1298c91f7969073c106115c'
* commit '16848a15bbb7648bb1298c91f7969073c106115c':
CallManager: do not deliver ring event if fg call is live.
There's currently a config.xml param in the phone app saying whether the
current device is "voice capable", which is used to determine (among other
things) whether the OTASP call should run in interactive mode.
But both Contacts and Settings are about to need this flag too, so it
really belongs in the framework instead. As of this change it's now
"com.android.internal.R.bool.voice_capable".
Also add a corresponding TelephonyManager call so that unbundled and 3rd
party apps can access it too.
Change-Id: Ie9a8803295bf97eb32154291aac8fce1e21c7b25
Merge commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03' into gingerbread-plus-aosp
* commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03':
revert hwcomposer HAL changes. DO NOT MERGE.
system_server can potentially monitor uevent devices that are
of no use to it. For instance, an accelerometer implementation
as uevents. This would cause the process to be busy when
unnecessary. If a device cannot be classified, don't monitor it.
Change-Id: Ib2c93105e7d746d9c1a7414bea8bab3fb8c0b70a
Merge commit '72e0b2ab08dc49857955a4560de296fdddada8dc' into gingerbread-plus-aosp
* commit '72e0b2ab08dc49857955a4560de296fdddada8dc':
Fix some input device mapping bugs with certain drivers.
Merge commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16' into gingerbread-plus-aosp
* commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16':
Making sure the draw time is measured.
Merge commit 'c4554b9a0885ac3713575e91d8d33c5670b52322' into gingerbread-plus-aosp
* commit 'c4554b9a0885ac3713575e91d8d33c5670b52322':
Keep track of remaining fd when devices are removed
Merge commit 'd313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp
* commit 'd313cab46e07c40f4cd1a94304a553e7eb809190':
tracking merge of external/apache-http from dalvik-dev
Merge commit 'c86960236d5b2095c87bf46de2400a905acabee2' into gingerbread-plus-aosp
* commit 'c86960236d5b2095c87bf46de2400a905acabee2':
Document that autoFocus must be called in auto and macro mode.
Merge commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd' into gingerbread-plus-aosp
* commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd':
Make the OggExtractor less verbose.
Merge commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68' into gingerbread-plus-aosp
* commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68':
Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
Merge commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8' into gingerbread-plus-aosp
* commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8':
Fix up handling of null fields in DownloadManager.
Merge commit 'e2f95e42c2ba27c7739b80ab9f52d1acfe1643e7' into gingerbread-plus-aosp
* commit 'e2f95e42c2ba27c7739b80ab9f52d1acfe1643e7':
Add more error checking for ndc
On single-touch devices, pointer up/down is signalled by a BTN_TOUCH
key event. Previously we handled BTN_TOUCH immediately but some drivers
may produce the sequence BTN_TOUCH, ABS_X, ABS_Y, SYN_REPORT on pointer down
which caused us to emit a bad initial pointer down location.
Now we wait for SYN_REPORT before reporting the up or down.
On multi-touch devices, pointer up can be signalled by as little as
the sequence SYN_MT_REPORT, SYN_REPORT. This change ensures that we
handle this case.
Added support for reading ABS_MT_PRESSURE when available.
Corrected mapping of touchMajor/touchMinor on single touch devices.
Minor code cleanup.
Change-Id: Ic7ec4811241ed85a06e59b8a839ca05180d491d4
Merge commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660' into gingerbread-plus-aosp
* commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660':
CallManager: do not deliver ring event if fg call is live.
Merge commit '04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321' into gingerbread-plus-aosp
* commit '04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321':
Import revised translations. DO NOT MERGE
Merge commit '72ce42352c1c229e05d910b4176f3cddb608e814' into gingerbread-plus-aosp
* commit '72ce42352c1c229e05d910b4176f3cddb608e814':
Fix possible race conditions during channel unregistration.
