OSDN Git Service
Dave Sparks [Wed, 11 Nov 2009 06:32:57 +0000 (22:32 -0800)]
am
dd861689: Merge change I05fd0df0 into eclair
Merge commit '
dd861689924198ed22115f0e21be1b81e159a7cc' into eclair-plus-aosp
* commit '
dd861689924198ed22115f0e21be1b81e159a7cc':
Fix potential deadlock in stopPreview/stopRecord.
Android (Google) Code Review [Wed, 11 Nov 2009 06:29:59 +0000 (22:29 -0800)]
Merge change I05fd0df0 into eclair
* changes:
Fix potential deadlock in stopPreview/stopRecord.
Daisuke Miyakawa [Wed, 11 Nov 2009 06:06:12 +0000 (22:06 -0800)]
am
fe17db4c: Merge change I4db11d50 into eclair
Merge commit '
fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-plus-aosp
* commit '
fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9':
Backport the change I30b141a2 from MR2 to MR1. Do not merge.
Android (Google) Code Review [Wed, 11 Nov 2009 06:03:20 +0000 (22:03 -0800)]
Merge change I4db11d50 into eclair
* changes:
Backport the change I30b141a2 from MR2 to MR1. Do not merge.
Daisuke Miyakawa [Wed, 11 Nov 2009 01:20:57 +0000 (10:20 +0900)]
Backport the change I30b141a2 from MR2 to MR1. Do not merge.
The previous implementation selected the first ContactValues object even when its name fields are all empty.
This time, vCard composer checks the name fields and skip the object without valid name.
One exception is the object with IS_SUPER_PRIMARY flag. If IS_SUPER_PRIMARY flag is set, the object will be
selected even when the object does not have valid name.
Dr.NO: Hiroshi
Internal issue number:
2252304
Dave Sparks [Wed, 11 Nov 2009 01:08:08 +0000 (17:08 -0800)]
Fix potential deadlock in stopPreview/stopRecord.
Some camera HALs spin up a preview thread and need to wait for
the thread to exit. This can create a potential deadlock. In
stopPreview, we take the main lock. If a preview callback occurs
while the lock is held, the preview thread will block. If the
camera HAL is waiting for the preview thread to exit, this will
cause a deadlock.
This patch breaks out the preview buffer heap into a separate
mutex. This mutex is never held when the main lock is held, thus
preventing the deadlock from occuring.
Fred Quintana [Wed, 11 Nov 2009 00:55:56 +0000 (16:55 -0800)]
am
ae0cf6dc: Merge change I50986dd4 into eclair
Merge commit '
ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e' into eclair-plus-aosp
* commit '
ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e':
Make the RegisteredSErvices Cache not allow the registered service for a
Android (Google) Code Review [Wed, 11 Nov 2009 00:53:43 +0000 (16:53 -0800)]
Merge change I50986dd4 into eclair
* changes:
Make the RegisteredSErvices Cache not allow the registered service for a type to change without first uninstalling the previous service for that type, unless the newly installed service is in the system image.
Lixin Yue [Wed, 11 Nov 2009 00:40:12 +0000 (16:40 -0800)]
am
971af003: Merge change I65208317 into eclair
Merge commit '
971af0030568ba25a83788506a3f29bc9f1cd10d' into eclair-plus-aosp
* commit '
971af0030568ba25a83788506a3f29bc9f1cd10d':
Update OBEX to fix missing several contact entries issue.
Dianne Hackborn [Wed, 11 Nov 2009 00:40:02 +0000 (16:40 -0800)]
am
48515f49: Merge change I0de7979b into eclair
Merge commit '
48515f495b29c01b473579825d5ba5e690ff5db7' into eclair-plus-aosp
* commit '
48515f495b29c01b473579825d5ba5e690ff5db7':
Fix issue #
2170897: wallpaper touch-up event not seen when exiting lock screen
Android (Google) Code Review [Wed, 11 Nov 2009 00:36:40 +0000 (16:36 -0800)]
Merge change I65208317 into eclair
* changes:
Update OBEX to fix missing several contact entries issue.
Fred Quintana [Mon, 9 Nov 2009 23:42:20 +0000 (15:42 -0800)]
Make the RegisteredSErvices Cache not allow the registered service for a
type to change without first uninstalling the previous service for that
type, unless the newly installed service is in the system image.
Notify the listener when a service is added or removed.
Make the AccountManagerService remove the accounts for an authenticator
when the registered authenticator changes from one uid to another.
Make the AbstractSyncableContentProvider force a sync when the database is first created.
Lixin Yue [Tue, 10 Nov 2009 16:51:22 +0000 (00:51 +0800)]
Update OBEX to fix missing several contact entries issue.
The third parameter count of PrivateOutputStream.write()
should be the size of vcards data plus header length, excluding the 3 bytes
for the response message and 3 bytes for the header ID and length.
Adjust the return value of getMaxPacketSize() by minus headser size, so that
applications should not get packet slipped during multiple sharing operation.
Do not set the header to null in getHeaderLength() to get PBAP PTS passed;
Per OBEX spec, for Get request:
Only the last packet need send the 0x49(End of Body);
for intermediate packets, we need to send 0x48 (Body).
If all packets use 0x49, some carkit like Nokia PD-17 will fail to download
all contacts, except data in the last packet.
Bug:
2246927
Dr No: Eastham
Android (Google) Code Review [Tue, 10 Nov 2009 23:27:36 +0000 (15:27 -0800)]
Merge change I0de7979b into eclair
* changes:
Fix issue #
2170897: wallpaper touch-up event not seen when exiting lock screen
Jack Palevich [Tue, 10 Nov 2009 23:25:11 +0000 (15:25 -0800)]
am
ba56915a: Merge change Ie806ae6f into eclair
Merge commit '
ba56915a71cad672baff5594dbb7c9331bf01283' into eclair-plus-aosp
* commit '
ba56915a71cad672baff5594dbb7c9331bf01283':
Fix multi-lock ordering issues in GLSurfaceView
Android (Google) Code Review [Tue, 10 Nov 2009 23:21:28 +0000 (15:21 -0800)]
Merge change Ie806ae6f into eclair
* changes:
Fix multi-lock ordering issues in GLSurfaceView
Dianne Hackborn [Tue, 10 Nov 2009 19:10:09 +0000 (11:10 -0800)]
Fix issue #
2170897: wallpaper touch-up event not seen when exiting lock screen
Make sure to deliver events to the wallpaper until the final up.
Also fix behavior in the case where a window goes away while the pointer is still
down in it, which is a fairly novel situation introduced by the new lock screen.
Also add infrastructure for delivering motion events during preview.
Change-Id: I0de7979be27e00caf0b1eff794ea899a815142f6
Andreas Huber [Tue, 10 Nov 2009 20:30:08 +0000 (12:30 -0800)]
am
cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit '
cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-plus-aosp
* 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.
Android (Google) Code Review [Tue, 10 Nov 2009 20:27:53 +0000 (12:27 -0800)]
Merge change I96c4d4b3 into eclair
* 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.
Andreas Huber [Tue, 10 Nov 2009 19:51:43 +0000 (11:51 -0800)]
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
Mike Lockwood [Tue, 10 Nov 2009 20:03:30 +0000 (12:03 -0800)]
am
cc9a63db: Add support for specifying the current LCD brightness mode to the backlight driver.
Merge commit '
cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134' into eclair-plus-aosp
* commit '
cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134':
Add support for specifying the current LCD brightness mode to the backlight driver.
Mike Lockwood [Tue, 10 Nov 2009 12:50:28 +0000 (07:50 -0500)]
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>
Dianne Hackborn [Tue, 10 Nov 2009 18:53:27 +0000 (10:53 -0800)]
am
119a7675: Merge change I83ba96fe into eclair
Merge commit '
119a767565399809d222ddda6392e5e58942d5e6' into eclair-plus-aosp
* commit '
119a767565399809d222ddda6392e5e58942d5e6':
Fix issue #
2246723: Only one Application object gets onCreate called
Android (Google) Code Review [Tue, 10 Nov 2009 18:27:05 +0000 (10:27 -0800)]
Merge change I83ba96fe into eclair
* changes:
Fix issue #
2246723: Only one Application object gets onCreate called
Gloria Wang [Tue, 10 Nov 2009 18:07:44 +0000 (10:07 -0800)]
am
bf964e6a: Merge change Ic060d86f into eclair
Merge commit '
bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-plus-aosp
* commit '
bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
Check whether test server is up before running tests which use streaming files.
Android (Google) Code Review [Tue, 10 Nov 2009 18:04:40 +0000 (10:04 -0800)]
Merge change Ic060d86f into eclair
* changes:
Check whether test server is up before running tests which use streaming files.
Scott Main [Tue, 10 Nov 2009 17:40:34 +0000 (09:40 -0800)]
am
13ce56bd: am
88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit '
13ce56bdbc4872c0b12caff501e063f5a75073db' into eclair-plus-aosp
* commit '
13ce56bdbc4872c0b12caff501e063f5a75073db':
docs: add more documentation for the bluetooth apis.
Dirk Dougherty [Tue, 10 Nov 2009 17:38:43 +0000 (09:38 -0800)]
am
84241293: am
3a103a87: Merge change I15536f3c into eclair-sdk
Merge commit '
84241293129423a1ebd7261e8139cfb20049535f' into eclair-plus-aosp
* commit '
84241293129423a1ebd7261e8139cfb20049535f':
doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
Scott Main [Tue, 10 Nov 2009 17:26:24 +0000 (09:26 -0800)]
am
88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit '
88427cff609e668185010af2244500be5823595e' into eclair
* commit '
88427cff609e668185010af2244500be5823595e':
docs: add more documentation for the bluetooth apis.
Android (Google) Code Review [Tue, 10 Nov 2009 17:21:00 +0000 (09:21 -0800)]
Merge change Ibcfb7d10 into eclair-sdk
* changes:
docs: add more documentation for the bluetooth apis.
Dirk Dougherty [Tue, 10 Nov 2009 17:20:55 +0000 (09:20 -0800)]
am
3a103a87: Merge change I15536f3c into eclair-sdk
Merge commit '
3a103a87b0b3b0e9055f32e1c7f0ec3a58456bad' into eclair
* commit '
3a103a87b0b3b0e9055f32e1c7f0ec3a58456bad':
doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
Android (Google) Code Review [Tue, 10 Nov 2009 17:13:29 +0000 (09:13 -0800)]
Merge change I15536f3c into eclair-sdk
* changes:
doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
Dirk Dougherty [Mon, 9 Nov 2009 19:41:09 +0000 (11:41 -0800)]
doc change: Add instruction to disable antivirus before installing SDK components. Add download page link to installing doc.
Bug:
2246467
Change-Id: I15536f3c7f2088fff8f60963ba23a69b1be43804
Mike Lockwood [Tue, 10 Nov 2009 15:16:49 +0000 (07:16 -0800)]
am
50c548d2: 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-plus-aosp
* commit '
50c548d242d637328ec6b2c4987969b02695cc7d':
Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
Mike Lockwood [Mon, 9 Nov 2009 21:02:06 +0000 (16:02 -0500)]
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>
Mike Lockwood [Tue, 10 Nov 2009 13:01:35 +0000 (05:01 -0800)]
am
ee2b094d: Do not deactivate the proximity sensor until after the sensor returns negative.
Merge commit '
ee2b094de0c5d7ffa64d51e7bd4ec3238be97113' into eclair-plus-aosp
* commit '
ee2b094de0c5d7ffa64d51e7bd4ec3238be97113':
Do not deactivate the proximity sensor until after the sensor returns negative.
Mike Lockwood [Mon, 9 Nov 2009 19:09:02 +0000 (14:09 -0500)]
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>
Mike Lockwood [Tue, 10 Nov 2009 12:38:26 +0000 (04:38 -0800)]
am
de342a01: Merge change Idcd98310 into eclair
Merge commit '
de342a01a0272540c8468fcfcf0f0067c0d743e0' into eclair-plus-aosp
* commit '
de342a01a0272540c8468fcfcf0f0067c0d743e0':
PowerManagerService: enable logging for when mPowerState changes.
Android (Google) Code Review [Tue, 10 Nov 2009 12:34:48 +0000 (04:34 -0800)]
Merge change Idcd98310 into eclair
* changes:
PowerManagerService: enable logging for when mPowerState changes.
Jack Palevich [Tue, 10 Nov 2009 10:26:42 +0000 (18:26 +0800)]
Fix multi-lock ordering issues in GLSurfaceView
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.
Mathias Agopian [Tue, 10 Nov 2009 03:34:26 +0000 (19:34 -0800)]
am
c421fc2a: Merge change Id09376d1 into eclair
Merge commit '
c421fc2ada7c1bff104733b840bd640151bebbbb' into eclair-plus-aosp
* commit '
c421fc2ada7c1bff104733b840bd640151bebbbb':
fix [
2071412] work around mdp 32-bits fade limitation
Marco Nelissen [Tue, 10 Nov 2009 03:34:14 +0000 (19:34 -0800)]
am
11cff8cd: Merge change Ie211adae into eclair
Merge commit '
11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-plus-aosp
* commit '
11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
Android (Google) Code Review [Tue, 10 Nov 2009 03:32:47 +0000 (19:32 -0800)]
Merge change Id09376d1 into eclair
* changes:
fix [
2071412] work around mdp 32-bits fade limitation
Android (Google) Code Review [Tue, 10 Nov 2009 03:31:02 +0000 (19:31 -0800)]
Merge change Ie211adae into eclair
* changes:
Add a way for wallpapers to know the delta between virtual screens.
Dave Sparks [Tue, 10 Nov 2009 03:06:18 +0000 (19:06 -0800)]
am
0c845661: Add new ringtone package. Bug
2219950.
Merge commit '
0c845661c54bac56910706b1fc0d88288b954890' into eclair-plus-aosp
* commit '
0c845661c54bac56910706b1fc0d88288b954890':
Add new ringtone package. Bug
2219950.
Dave Sparks [Tue, 10 Nov 2009 03:06:09 +0000 (19:06 -0800)]
am
bb0db626: Merge change I2a4b120c into eclair
Merge commit '
bb0db6267851b923a8370355c68adfc3bb30108d' into eclair-plus-aosp
* commit '
bb0db6267851b923a8370355c68adfc3bb30108d':
Add more ringtones. Bug
2219950.
Dave Sparks [Tue, 10 Nov 2009 03:00:20 +0000 (19:00 -0800)]
Add new ringtone package. Bug
2219950.
Android (Google) Code Review [Tue, 10 Nov 2009 03:02:17 +0000 (19:02 -0800)]
Merge change I2a4b120c into eclair
* changes:
Add more ringtones. Bug
2219950.
Scott Main [Wed, 4 Nov 2009 02:17:59 +0000 (18:17 -0800)]
docs: add more documentation for the bluetooth apis.
more descriptions for some of the classes and a new
overview and pseudo-code example for using BT APIs
in the package summary.
Mathias Agopian [Tue, 10 Nov 2009 01:55:59 +0000 (17:55 -0800)]
fix [
2071412] work around mdp 32-bits fade limitation
make sure to always specify blits *inside* the source bitmap.
Marco Nelissen [Mon, 9 Nov 2009 23:21:13 +0000 (15:21 -0800)]
Add a way for wallpapers to know the delta between virtual screens.
Dave Sparks [Tue, 10 Nov 2009 00:50:55 +0000 (16:50 -0800)]
Add more ringtones. Bug
2219950.
Xavier Ducrohet [Tue, 10 Nov 2009 00:56:56 +0000 (16:56 -0800)]
am
e6ab011b: Merge change Ib12bcb7f into eclair
Merge commit '
e6ab011b8b8aa6c461e64cabb9b25d890d68edb1' into eclair-plus-aosp
* commit '
e6ab011b8b8aa6c461e64cabb9b25d890d68edb1':
Support for fallback fonts in layoutlib.
Mike Lockwood [Tue, 10 Nov 2009 00:53:08 +0000 (19:53 -0500)]
PowerManagerService: enable logging for when mPowerState changes.
Change-Id: Idcd983106d66629070eda15e1160f708c789ab05
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Tue, 10 Nov 2009 00:52:54 +0000 (16:52 -0800)]
Merge change Ib12bcb7f into eclair
* changes:
Support for fallback fonts in layoutlib.
Gloria Wang [Mon, 9 Nov 2009 23:31:27 +0000 (15:31 -0800)]
Check whether test server is up before running tests which use streaming files.
Xavier Ducrohet [Sun, 8 Nov 2009 23:15:01 +0000 (15:15 -0800)]
Support for fallback fonts in layoutlib.
BUG
2041229
Change-Id: Ib12bcb7f6d8f0e4c2b51871f8129ecf51fa938ee
Dave Sparks [Mon, 9 Nov 2009 21:49:16 +0000 (13:49 -0800)]
am
3ea2ae7d: Merge change I47aa76bf into eclair
Merge commit '
3ea2ae7d6f8a73947831c15f970de70730c5a0f6' into eclair-plus-aosp
* commit '
3ea2ae7d6f8a73947831c15f970de70730c5a0f6':
Add new notifications and ringtones.
Android (Google) Code Review [Mon, 9 Nov 2009 21:46:17 +0000 (13:46 -0800)]
Merge change I47aa76bf into eclair
* changes:
Add new notifications and ringtones.
Robert Greenwalt [Mon, 9 Nov 2009 20:41:44 +0000 (12:41 -0800)]
am
fe225e25: Merge change I70e1f7a6 into eclair
Merge commit '
fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-plus-aosp
* commit '
fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
Fix the selection of locale from SIM mcc.
Dave Sparks [Mon, 9 Nov 2009 19:59:10 +0000 (11:59 -0800)]
Add new notifications and ringtones.
Android (Google) Code Review [Mon, 9 Nov 2009 20:37:22 +0000 (12:37 -0800)]
Merge change I70e1f7a6 into eclair
* changes:
Fix the selection of locale from SIM mcc.
Dianne Hackborn [Mon, 9 Nov 2009 20:30:12 +0000 (12:30 -0800)]
Fix issue #
2246723: Only one Application object gets onCreate called
Change-Id: I83ba96fe81ad04258099d6f94a667dc7d9dd4fd3
Eric Laurent [Mon, 9 Nov 2009 19:55:45 +0000 (11:55 -0800)]
am
090c60bb: Merge change I73b60354 into eclair
Merge commit '
090c60bb9d6608df4a8d753fc91974fe2c49c262' into eclair-plus-aosp
* commit '
090c60bb9d6608df4a8d753fc91974fe2c49c262':
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
Bjorn Bringert [Mon, 9 Nov 2009 19:55:37 +0000 (11:55 -0800)]
am
2bb53754: Merge change Icaf932d0 into eclair
Merge commit '
2bb53754337225508f2b4d12f1575df7c226100c' into eclair-plus-aosp
* commit '
2bb53754337225508f2b4d12f1575df7c226100c':
Fix code example in Parcelable javadoc
Eric Laurent [Mon, 9 Nov 2009 19:55:25 +0000 (11:55 -0800)]
am
93572eef: Merge change Ifb9d6df3 into eclair
Merge commit '
93572eef41f94f023037482f194db0ab07d0c33a' into eclair-plus-aosp
* commit '
93572eef41f94f023037482f194db0ab07d0c33a':
More log for issue
2242381.
Dianne Hackborn [Mon, 9 Nov 2009 19:55:16 +0000 (11:55 -0800)]
am
644693f4: Merge change Ic42763b1 into eclair
Merge commit '
644693f4caf2364a0e811dca13304788e2c8fee8' into eclair-plus-aosp
* commit '
644693f4caf2364a0e811dca13304788e2c8fee8':
Fix issue #
2242440: Window screen brightness attribute is broken
Mike Lockwood [Mon, 9 Nov 2009 19:55:00 +0000 (11:55 -0800)]
am
ba8eb1ef: Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '
ba8eb1efefdc98c016b64e10c26f9729697f254f' into eclair-plus-aosp
* commit '
ba8eb1efefdc98c016b64e10c26f9729697f254f':
Use SystemClock.elapsedRealtime() instead of sensor timestamp
Mike Lockwood [Mon, 9 Nov 2009 19:54:50 +0000 (11:54 -0800)]
am
17479ebe: Merge change I1bc566a1 into eclair
Merge commit '
17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-plus-aosp
* commit '
17479ebe90a5ebd17ee386b8fd83256765afce0b':
Ignore the light sensor if the screen is turning off.
Christopher Tate [Mon, 9 Nov 2009 19:54:40 +0000 (11:54 -0800)]
am
1dacdd48: Reset binder service threads\' cgroup/priority after command completion
Merge commit '
1dacdd482894bee9fbc1993cbb525fb800750222' into eclair-plus-aosp
* commit '
1dacdd482894bee9fbc1993cbb525fb800750222':
Reset binder service threads' cgroup/priority after command completion
Jack Palevich [Mon, 9 Nov 2009 19:54:29 +0000 (11:54 -0800)]
am
3f857b78: Merge change I32d41651 into eclair
Merge commit '
3f857b78fc68e5d700139bdc6078c5333b62a9bc' into eclair-plus-aosp
* commit '
3f857b78fc68e5d700139bdc6078c5333b62a9bc':
Allow a GLThread to release and reacquire the EGL Surface as needed.
Mike Lockwood [Mon, 9 Nov 2009 19:54:18 +0000 (11:54 -0800)]
am
96fce6e1: Merge change I62704736 into eclair
Merge commit '
96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-plus-aosp
* commit '
96fce6e112aec1e09c82cfd7657381ce112dc555':
Do not apply light sensor debounce logic while the light sensor is still warming up.
Android (Google) Code Review [Mon, 9 Nov 2009 16:53:11 +0000 (08:53 -0800)]
Merge change I73b60354 into eclair
* changes:
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
Android (Google) Code Review [Mon, 9 Nov 2009 16:09:35 +0000 (08:09 -0800)]
Merge change Icaf932d0 into eclair
* changes:
Fix code example in Parcelable javadoc
Eric Laurent [Mon, 9 Nov 2009 12:45:39 +0000 (04:45 -0800)]
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
This problem was encountered as a side effect of issue
2245298.
Android (Google) Code Review [Mon, 9 Nov 2009 06:58:34 +0000 (22:58 -0800)]
Merge change Ifb9d6df3 into eclair
* changes:
More log for issue
2242381.
Android (Google) Code Review [Mon, 9 Nov 2009 02:07:14 +0000 (18:07 -0800)]
Merge change Ic42763b1 into eclair
* changes:
Fix issue #
2242440: Window screen brightness attribute is broken
Dianne Hackborn [Mon, 9 Nov 2009 01:37:07 +0000 (17:37 -0800)]
Fix issue #
2242440: Window screen brightness attribute is broken
Um okay, that was dumb. And I guess this means it is time to make 6.xml.
Change-Id: Ic42763b1c8a13448cf6db20b4cd6daadc7786ac1
Jean-Baptiste Queru [Mon, 9 Nov 2009 01:03:30 +0000 (17:03 -0800)]
merge from open-source master
Mike Lockwood [Mon, 9 Nov 2009 00:31:18 +0000 (19:31 -0500)]
Use SystemClock.elapsedRealtime() instead of sensor timestamp
when processing light and proximity events.
This should fix loss of 2 second hysterisis for light sensor (b/
2243521)
Change-Id: Ia3ce331e67d803eb5e51810cb7161b7c528312d7
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Sun, 8 Nov 2009 23:51:02 +0000 (15:51 -0800)]
Merge change I1bc566a1 into eclair
* changes:
Ignore the light sensor if the screen is turning off.
Mike Lockwood [Sun, 8 Nov 2009 23:33:03 +0000 (18:33 -0500)]
Ignore the light sensor if the screen is turning off.
Fixes bug b/
2202165. The light sensor was interfering with the screen off animation.
Change-Id: I1bc566a164af689b60b066e6cb3dcbf7959bc50a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Christopher Tate [Sun, 8 Nov 2009 22:29:02 +0000 (14:29 -0800)]
Reset binder service threads' cgroup/priority after command completion
To prevent buggy command implementations from poisoning binder threads'
scheduling class & priority for future command execution, we now reset the
cgroup and thread priority to foreground/normal when a binder service thread
finishes executing the designated command.
Change-Id: Ibc0ab2485751453f6dc96fdb4eb877fd02796e3f
Android Code Review [Sun, 8 Nov 2009 20:33:19 +0000 (12:33 -0800)]
Merge change Ia01d5fe8
* changes:
Fix documentation example, per issue 895 on android.googlecode.com
Android (Google) Code Review [Sun, 8 Nov 2009 18:19:59 +0000 (10:19 -0800)]
Merge change I32d41651 into eclair
* changes:
Allow a GLThread to release and reacquire the EGL Surface as needed.
Jack Palevich [Sun, 8 Nov 2009 02:55:56 +0000 (10:55 +0800)]
Allow a GLThread to release and reacquire the EGL Surface as needed.
We currently only allow one GLThread to have an active EGL Surface at a
time.(This may be lifted in the future, when EGL and GL are reentrant.)
Prior to this change we would enforce this rule by having older GLThreads
quit when a new GLThread started. That had the drawback of leaving the
older GLSurfaceViews in a zombie state -- their GLThreads would be
gone.
We now enforce this rule by just releasing and reacquiring the EGL surface
context as needed.
Specific changes to the code:
created private helper methods - startEgl and stopEgl to help manage
starting and stopping EGL.
Move the calls to sGLThreadManager start and end from the outermost run
method into the startEgl / stopEgl methods.
Reworked the wait loop to handle starting and stopping EGL as needed.
needToWait() gets simpler -- just looks at current status.
sGLThreadManager.shouldQuit was replaced by shouldHaveEgl.
This is another step in fixing bug
2228262.
Android (Google) Code Review [Sun, 8 Nov 2009 02:11:06 +0000 (18:11 -0800)]
Merge change I62704736 into eclair
* changes:
Do not apply light sensor debounce logic while the light sensor is still warming up.
Mike Lockwood [Sun, 8 Nov 2009 01:33:47 +0000 (20:33 -0500)]
Do not apply light sensor debounce logic while the light sensor is still warming up.
This allows us to adjust immediately when we receive a correct light sensor reading
after the screen turns on.
Change-Id: I627047365640761727348e577c9164a6d6be2772
Signed-off-by: Mike Lockwood <lockwood@android.com>
Grace Kloba [Sat, 7 Nov 2009 18:56:25 +0000 (10:56 -0800)]
am
0691ad50: Remove "@hide pending API council" in webkit to expose the apis to SDK.
Merge commit '
0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65' into eclair-plus-aosp
* commit '
0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65':
Remove "@hide pending API council" in webkit to expose
Grace Kloba [Thu, 22 Oct 2009 19:17:20 +0000 (12:17 -0700)]
Remove "@hide pending API council" in webkit to expose
the apis to SDK.
Remove @hide in GeolocationPermissions and WebStorage
to expose them to the SDK users.
Remove @hide for freeMemory() in WebView.
Remove @hide comment in CallbackProxy and
GoogleLocationSettingManager as they are not public class.
Eric Laurent [Sat, 7 Nov 2009 08:01:32 +0000 (00:01 -0800)]
More log for issue
2242381.
Added more log in system dump for AudioFlinger and AudioPolicyService to help debug issue
2242381 and other issues where the audio driver hangs.
Charles Mendis [Sat, 7 Nov 2009 06:12:05 +0000 (22:12 -0800)]
am
638d8653: Merge change I47ef4266 into eclair
Merge commit '
638d86535264b24b54698fca7e18e68571fe0bad' into eclair-plus-aosp
* commit '
638d86535264b24b54698fca7e18e68571fe0bad':
Expose WallpaperSettingsActivity in the public API.
Android (Google) Code Review [Sat, 7 Nov 2009 06:05:34 +0000 (01:05 -0500)]
Merge change I47ef4266 into eclair
* changes:
Expose WallpaperSettingsActivity in the public API.
Romain Guy [Sat, 7 Nov 2009 02:36:25 +0000 (18:36 -0800)]
am
9d790678: Merge change I32ce8591 into eclair
Merge commit '
9d790678bb83c829dddb9e4d0d6d6c4db7facc8b' into eclair-plus-aosp
* commit '
9d790678bb83c829dddb9e4d0d6d6c4db7facc8b':
Stop scrolling ListView when tapping a clickable item.
Android (Google) Code Review [Sat, 7 Nov 2009 02:29:56 +0000 (21:29 -0500)]
Merge change I32ce8591 into eclair
* changes:
Stop scrolling ListView when tapping a clickable item.
Charles Mendis [Sat, 7 Nov 2009 02:06:06 +0000 (18:06 -0800)]
Expose WallpaperSettingsActivity in the public API.
Romain Guy [Sat, 7 Nov 2009 01:41:43 +0000 (17:41 -0800)]
Stop scrolling ListView when tapping a clickable item.
Bug #
2210279.
Approved by mcleron.
Change-Id: I32ce8591b00fada95072513f5de69674b45e4cf3
Mathias Agopian [Sat, 7 Nov 2009 01:16:15 +0000 (17:16 -0800)]
am
45dd12cb: Merge change I9f3020db into eclair
Merge commit '
45dd12cb0834ea5d72872a6d5b3095f3af152434' into eclair-plus-aosp
* commit '
45dd12cb0834ea5d72872a6d5b3095f3af152434':
fix [
2243164] live wallpaper screen artifacts at end of boot
Android (Google) Code Review [Sat, 7 Nov 2009 01:08:35 +0000 (20:08 -0500)]
Merge change I9f3020db into eclair
* changes:
fix [
2243164] live wallpaper screen artifacts at end of boot
Mathias Agopian [Sat, 7 Nov 2009 00:30:18 +0000 (16:30 -0800)]
fix [
2243164] live wallpaper screen artifacts at end of boot
make sure to glClear() the areas not touched by the animation