Merge commit 'a300625625feae9f7eb28694e4a31335442c420b' into eclair-mr2-plus-aosp
* commit 'a300625625feae9f7eb28694e4a31335442c420b':
Fix issue #2246723: Only one Application object gets onCreate called
Merge commit '119a767565399809d222ddda6392e5e58942d5e6' into eclair-mr2
* commit '119a767565399809d222ddda6392e5e58942d5e6':
Fix issue #2246723: Only one Application object gets onCreate called
Merge commit '28b0e311959baa55e0c6c9762831165dbafb5046'
* commit '28b0e311959baa55e0c6c9762831165dbafb5046':
Check whether test server is up before running tests which use streaming files.
Merge commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331' into eclair-mr2-plus-aosp
* commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331':
Check whether test server is up before running tests which use streaming files.
Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-mr2
* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
Check whether test server is up before running tests which use streaming files.
Merge commit '8e5cee5d26cfb08e72199280a4be86e9f85c43fe'
* commit '8e5cee5d26cfb08e72199280a4be86e9f85c43fe':
docs: add more documentation for the bluetooth apis.
Merge commit 'b262f50af9ad22837af9e88e6c8f71b44cdefd56' into eclair-mr2-plus-aosp
* commit 'b262f50af9ad22837af9e88e6c8f71b44cdefd56':
docs: add more documentation for the bluetooth apis.
Merge commit '13ce56bdbc4872c0b12caff501e063f5a75073db' into eclair-mr2
* commit '13ce56bdbc4872c0b12caff501e063f5a75073db':
docs: add more documentation for the bluetooth apis.
Merge commit '88427cff609e668185010af2244500be5823595e' into eclair
* commit '88427cff609e668185010af2244500be5823595e':
docs: add more documentation for the bluetooth apis.
Merge commit '260fdc776b5455df5ce01cf745e1591eeac6d9f4'
* commit '260fdc776b5455df5ce01cf745e1591eeac6d9f4':
Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
Merge commit '07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c' into eclair-mr2-plus-aosp
* commit '07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c':
Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
Merge commit '50c548d242d637328ec6b2c4987969b02695cc7d' into eclair-mr2
* commit '50c548d242d637328ec6b2c4987969b02695cc7d':
Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
This is part of a fix for bug b/2248320 (Lock screen does not time out after
Change-Id: Iba7f8a7b9997ecb0e4da37667600055f9a35531c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '16182e74c81e6a54826a57aa6ddcd7df2c2c11da'
* commit '16182e74c81e6a54826a57aa6ddcd7df2c2c11da':
Do not deactivate the proximity sensor until after the sensor returns negative.
Merge commit '245eaeedf873c5c60e1ad442d2290c108336fb67' into eclair-mr2-plus-aosp
* commit '245eaeedf873c5c60e1ad442d2290c108336fb67':
Do not deactivate the proximity sensor until after the sensor returns negative.
Merge commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113' into eclair-mr2
* commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113':
Do not deactivate the proximity sensor until after the sensor returns negative.
This ensures that we do not get cheek presses immediately after a call is ended.
Fixes bug b/2246824 (prox sensor subtleties when call ends)
Change-Id: I97d39b7689d9ea2e94ea9aceeb93bf15228ec095
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'e4fed7dc2465726892da426ae193bbec9a34d554' into eclair-mr2-plus-aosp
* commit 'e4fed7dc2465726892da426ae193bbec9a34d554':
PowerManagerService: enable logging for when mPowerState changes.
Merge commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0' into eclair-mr2
* commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0':
PowerManagerService: enable logging for when mPowerState changes.
e.g. "# Comment?"
In both vCard 2.1 and vCard 3.0, this syntax is never allowed, but some actual exporter seems to emit this kind of comment sometimes.
Both vCard 2.1 and vCard 3.0 allows some property to use multiple lines, so this change may cause another problem.
For example, if the "NOTE" property uses Quoted-Printable type, has several lines, and one of the lines starts with '#', we cannot know whether the line is "comment" or not.
Fortunately, in this change, the line is parsed as part of "NOTE" property, so I think there's no problem "right now", which does not mean that it is completely fine with vCard files Android will encounter in the future.
This change is already submitted into MR2.
Internal issue number: 2245363
There were potential deadlocks between the per-GLThread monitors and the
GLThreadManager monitor.
To avoid these deadlocks we now use a single monitor for
both the GLThreadManager state and the per-GLThread state.
Converted GLThreadManager's semaphore into the equivalent
synchronized-wait-notifyAll code. This enables us to wait for
either mDone, or user events, or the EGL surface with a single "wait()".
Simplified the logic used to acquire and release the EGL surface. The
EGL surface is now only requested while the surfaceFlinger surface
is acquired.
Removed the "egl surface stealing" policy we had recently inserted.
It's not needed now that we reliably quit when requested.
Pulled user event processing outside of the GLThreadManager monitor
so that we don't call any potentially-long-running code while
inside the monitor.
This should help with bug 2228262.
Merge commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4'
* commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '949ffa3da5231772425c3bde50caeab6c4d08ec5' into eclair-mr2-plus-aosp
* commit '949ffa3da5231772425c3bde50caeab6c4d08ec5':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-mr2
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
