Merge commit '555ecc7d8e3f4983517c056f6f5c14a24e082363'
* commit '555ecc7d8e3f4983517c056f6f5c14a24e082363':
Make MediaPlayerImpl less verbose by default.
Merge commit '6780d8c006c9381919c0ee4de3d2bdc6d7a728d6' into eclair-mr2-plus-aosp
* commit '6780d8c006c9381919c0ee4de3d2bdc6d7a728d6':
Make MediaPlayerImpl less verbose by default.
Merge commit '00443d661de7d8a06f5126a735d832045a827110'
* commit '00443d661de7d8a06f5126a735d832045a827110':
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
Merge commit 'f30404929e4f44eeb1190d85e1b3794a24b4a5b4'
* commit 'f30404929e4f44eeb1190d85e1b3794a24b4a5b4':
Add support for specifying the current LCD brightness mode to the backlight driver.
Merge commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7' into eclair-mr2-plus-aosp
* commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7':
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
Merge commit 'e93f49b7ff34b1f8c689b6a3ed85ef92b64d094a' into eclair-mr2-plus-aosp
* commit 'e93f49b7ff34b1f8c689b6a3ed85ef92b64d094a':
Add support for specifying the current LCD brightness mode to the backlight driver.
Merge commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-mr2
* commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8':
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
* changes:
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
Merge commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134' into eclair-mr2
* commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134':
Add support for specifying the current LCD brightness mode to the backlight driver.
This allows the driver to behave differently depending on if the lighting is being
managed by the light sensor or by a user preference.
Change-Id: I4b9325f82b7aded0ce5cfc6c07658666bbdae331
Signed-off-by: Mike Lockwood <lockwood@android.com>
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.
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.
