OSDN Git Service
Dirk Dougherty [Fri, 23 Oct 2009 01:13:49 +0000 (18:13 -0700)]
am
86dc4d31: am
61c29c29: Merge change Ieeb0b251 into eclair-sdk
Merge commit '
86dc4d312216be0b4c2847a1e79d94efaf4b9559' into eclair-plus-aosp
* commit '
86dc4d312216be0b4c2847a1e79d94efaf4b9559':
doc change: incorporate comments on SDK docs and structure.
Dirk Dougherty [Fri, 23 Oct 2009 01:02:54 +0000 (18:02 -0700)]
am
61c29c29: Merge change Ieeb0b251 into eclair-sdk
Merge commit '
61c29c293adf0ea4e28eefafbd1be948eb2d85c8' into eclair
* commit '
61c29c293adf0ea4e28eefafbd1be948eb2d85c8':
doc change: incorporate comments on SDK docs and structure.
Fred Quintana [Fri, 23 Oct 2009 01:02:24 +0000 (18:02 -0700)]
am
0bf653b5: am
f4520f3e: Merge change I9161f53d into eclair-sdk
Merge commit '
0bf653b531b8582012ed211fe65e50702589a7c4' into eclair-plus-aosp
* commit '
0bf653b531b8582012ed211fe65e50702589a7c4':
update account manager javadoc
Android (Google) Code Review [Fri, 23 Oct 2009 00:53:38 +0000 (20:53 -0400)]
Merge change Ieeb0b251 into eclair-sdk
* changes:
doc change: incorporate comments on SDK docs and structure.
Fred Quintana [Fri, 23 Oct 2009 00:53:28 +0000 (17:53 -0700)]
am
f4520f3e: Merge change I9161f53d into eclair-sdk
Merge commit '
f4520f3e03e120ed109a579c1936994b142523c3' into eclair
* commit '
f4520f3e03e120ed109a579c1936994b142523c3':
update account manager javadoc
Android (Google) Code Review [Fri, 23 Oct 2009 00:44:12 +0000 (20:44 -0400)]
Merge change I9161f53d into eclair-sdk
* changes:
update account manager javadoc
Dirk Dougherty [Thu, 22 Oct 2009 23:08:32 +0000 (16:08 -0700)]
doc change: incorporate comments on SDK docs and structure.
Bug:
2160782
Fred Quintana [Wed, 21 Oct 2009 20:43:10 +0000 (13:43 -0700)]
update account manager javadoc
Eric Fischer [Thu, 22 Oct 2009 22:47:23 +0000 (15:47 -0700)]
am
94f2c524: Merge change I63c2d9ed into eclair
Merge commit '
94f2c524214b56ac2416f79cf9e81fa598327917' into eclair-plus-aosp
* commit '
94f2c524214b56ac2416f79cf9e81fa598327917':
Update the names of the widgets when the locale changes.
Tom Taylor [Thu, 22 Oct 2009 22:47:06 +0000 (15:47 -0700)]
am
6c618c68: Merge change Ie7105dae into eclair
Merge commit '
6c618c68f251e42210f7c2f45d69498352da87e0' into eclair-plus-aosp
* commit '
6c618c68f251e42210f7c2f45d69498352da87e0':
Handle bad SIM message
Android (Google) Code Review [Thu, 22 Oct 2009 22:38:29 +0000 (18:38 -0400)]
Merge change I63c2d9ed into eclair
* changes:
Update the names of the widgets when the locale changes.
Android (Google) Code Review [Thu, 22 Oct 2009 22:37:51 +0000 (18:37 -0400)]
Merge change Ie7105dae into eclair
* changes:
Handle bad SIM message
Eric Fischer [Thu, 22 Oct 2009 22:22:50 +0000 (15:22 -0700)]
Update the names of the widgets when the locale changes.
Bug
1814373, Bug
2152730
Tom Taylor [Thu, 22 Oct 2009 18:42:10 +0000 (11:42 -0700)]
Handle bad SIM message
When trying to view the saved sms messages on my SIM, I ran into a null ref.
With this fix, we don't try and wrap a null message, but just skip it.
This is part one of three fixes for BC-triaged bug
2205782.
Change-Id: Ie7105dae7e3134b98681deabcc14f5db555902f3
Mike Lockwood [Thu, 22 Oct 2009 20:32:47 +0000 (13:32 -0700)]
am
96e0c315: Merge change Ia3f7ef64 into eclair
Merge commit '
96e0c3156e21bbdb0d94201b08d80379b98c472a' into eclair-plus-aosp
* commit '
96e0c3156e21bbdb0d94201b08d80379b98c472a':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Dirk Dougherty [Thu, 22 Oct 2009 20:32:31 +0000 (13:32 -0700)]
am
4f82394a: am
ee58d1bf: doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Merge commit '
4f82394af6486e1725ae6b6dd3b0334dcfc52747' into eclair-plus-aosp
* commit '
4f82394af6486e1725ae6b6dd3b0334dcfc52747':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Dirk Dougherty [Thu, 22 Oct 2009 20:32:18 +0000 (13:32 -0700)]
am
f41eb87d: am
6797b9fa: doc change: add diff report 4 -> 5
Merge commit '
f41eb87df2c88c4a045dac5c073e8be87c5b0832' into eclair-plus-aosp
* commit '
f41eb87df2c88c4a045dac5c073e8be87c5b0832':
doc change: add diff report 4 -> 5
Dirk Dougherty [Thu, 22 Oct 2009 20:32:01 +0000 (13:32 -0700)]
am
e12191a7: am
439bf97c: doc change: edits to the screens support doc.
Merge commit '
e12191a7ec9ab35e4ce80726be2734881a24a223' into eclair-plus-aosp
* commit '
e12191a7ec9ab35e4ce80726be2734881a24a223':
doc change: edits to the screens support doc.
Dirk Dougherty [Thu, 22 Oct 2009 20:31:48 +0000 (13:31 -0700)]
am
e5e2c167: am
f4b5540b: doc change only: add screens support doc
Merge commit '
e5e2c167366ff3823b4096af00b2a2ab2d0e6127' into eclair-plus-aosp
* commit '
e5e2c167366ff3823b4096af00b2a2ab2d0e6127':
doc change only: add screens support doc
Scott Main [Thu, 22 Oct 2009 20:31:34 +0000 (13:31 -0700)]
am
3c0c0da9: am
f90178d0: docs only. fix some typos.
Merge commit '
3c0c0da95f23712fb926fc9edf4023528eabd868' into eclair-plus-aosp
* commit '
3c0c0da95f23712fb926fc9edf4023528eabd868':
docs only.
Android (Google) Code Review [Thu, 22 Oct 2009 20:24:05 +0000 (16:24 -0400)]
Merge change Ia3f7ef64 into eclair
* changes:
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Mike Lockwood [Thu, 22 Oct 2009 19:45:37 +0000 (15:45 -0400)]
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Fixes bug b/
2158297 (lock screen should time out after 7 seconds)
Change-Id: Ia3f7ef6464129ab78283923dbfd7f7472136e676
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dirk Dougherty [Thu, 22 Oct 2009 18:22:12 +0000 (11:22 -0700)]
am
ee58d1bf: doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Merge commit '
ee58d1bf9c54eaed623c4419e1d9db269a9c4137' into eclair
* commit '
ee58d1bf9c54eaed623c4419e1d9db269a9c4137':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Dirk Dougherty [Thu, 22 Oct 2009 18:21:47 +0000 (11:21 -0700)]
am
6797b9fa: doc change: add diff report 4 -> 5
Merge commit '
6797b9fa06b4c86b92da117a7f84277f7a380820' into eclair
* commit '
6797b9fa06b4c86b92da117a7f84277f7a380820':
doc change: add diff report 4 -> 5
jsh [Thu, 22 Oct 2009 18:21:30 +0000 (11:21 -0700)]
am
f14da417: Merge change I3ff560d7 into eclair
Merge commit '
f14da417f3cb1f80a62732238623bb83173255c0' into eclair-plus-aosp
* commit '
f14da417f3cb1f80a62732238623bb83173255c0':
Send "encoding problem" to the network for general errors during SMS dispatch.
Dirk Dougherty [Thu, 22 Oct 2009 18:21:23 +0000 (11:21 -0700)]
am
439bf97c: doc change: edits to the screens support doc.
Merge commit '
439bf97ca5adb3e33eaf15faf25034b012a7d9d0' into eclair
* commit '
439bf97ca5adb3e33eaf15faf25034b012a7d9d0':
doc change: edits to the screens support doc.
Dirk Dougherty [Thu, 22 Oct 2009 18:21:12 +0000 (11:21 -0700)]
am
f4b5540b: doc change only: add screens support doc
Merge commit '
f4b5540b35a37ae5b999a50c2195bb43eb125f3c' into eclair
* commit '
f4b5540b35a37ae5b999a50c2195bb43eb125f3c':
doc change only: add screens support doc
Scott Main [Thu, 22 Oct 2009 18:20:55 +0000 (11:20 -0700)]
Mike Lockwood [Thu, 22 Oct 2009 18:16:14 +0000 (11:16 -0700)]
am
fee0f577: Merge change I99dc6477 into eclair
Merge commit '
fee0f5773335e42f4ffdf2d2d1c344ceee3ccb33' into eclair-plus-aosp
* commit '
fee0f5773335e42f4ffdf2d2d1c344ceee3ccb33':
Add WindowManagerPolicy.allowKeyRepeat() method for disabling key repeats.
Mike Lockwood [Thu, 22 Oct 2009 18:15:57 +0000 (11:15 -0700)]
am
eadb97b4: Merge change I53f83502 into eclair
Merge commit '
eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9' into eclair-plus-aosp
* commit '
eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9':
PowerManagerService: Ignore user activity while the screen is animating off.
Brandon Ballinger [Thu, 22 Oct 2009 18:15:32 +0000 (11:15 -0700)]
am
0737b164: Merge change I959a6f46 into eclair
Merge commit '
0737b1643071694cf8767e3609ad628f1679d63a' into eclair-plus-aosp
* commit '
0737b1643071694cf8767e3609ad628f1679d63a':
Fix bug
2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher.
Robert Greenwalt [Thu, 22 Oct 2009 18:14:12 +0000 (11:14 -0700)]
am
f702f1f3: Merge change I1538dba4 into eclair
Merge commit '
f702f1f33fb5490854579a1f5ce61c70ea7fd768' into eclair-plus-aosp
* commit '
f702f1f33fb5490854579a1f5ce61c70ea7fd768':
Make FWK start a wifi scan if supplicant forgets. (do not merge)
Naveen Kalla [Thu, 22 Oct 2009 18:13:17 +0000 (11:13 -0700)]
am
076cb23a: Merge change I13dd02fc into eclair
Merge commit '
076cb23a024f256817b5dc22830c3f9a9e0a44a7' into eclair-plus-aosp
* commit '
076cb23a024f256817b5dc22830c3f9a9e0a44a7':
telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
Andreas Huber [Thu, 22 Oct 2009 18:13:05 +0000 (11:13 -0700)]
am
b0e6a9a0: Merge change I7a03b074 into eclair
Merge commit '
b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-plus-aosp
* commit '
b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Android (Google) Code Review [Thu, 22 Oct 2009 18:04:03 +0000 (14:04 -0400)]
Merge change I3ff560d7 into eclair
* changes:
Send "encoding problem" to the network for general errors during SMS dispatch.
Android (Google) Code Review [Thu, 22 Oct 2009 11:07:04 +0000 (07:07 -0400)]
Merge change I99dc6477 into eclair
* changes:
Add WindowManagerPolicy.allowKeyRepeat() method for disabling key repeats.
Android (Google) Code Review [Thu, 22 Oct 2009 11:06:51 +0000 (07:06 -0400)]
Merge change I53f83502 into eclair
* changes:
PowerManagerService: Ignore user activity while the screen is animating off.
Dirk Dougherty [Fri, 16 Oct 2009 22:25:15 +0000 (15:25 -0700)]
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Change-Id:I368345755dd753b1056fb06ff25e4b32f3020e4d
Bug:
2160782
Dirk Dougherty [Fri, 16 Oct 2009 16:00:38 +0000 (09:00 -0700)]
doc change: add diff report 4 -> 5
Bug:
2160782
Mike Lockwood [Thu, 22 Oct 2009 02:58:29 +0000 (22:58 -0400)]
Add WindowManagerPolicy.allowKeyRepeat() method for disabling key repeats.
Part of a fix for bug b/
2198537
Change-Id: I99dc64772fa7644b12432d5549603025196ea3e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 21 Oct 2009 20:03:18 +0000 (16:03 -0400)]
PowerManagerService: Ignore user activity while the screen is animating off.
Fixes bug b/
2202165 (Often I when pressing power to turn off I get the lock screen)
Change-Id: I53f8350203d57fbb5f143edc44985879caadd78f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Thu, 22 Oct 2009 02:58:39 +0000 (22:58 -0400)]
Merge change I959a6f46 into eclair
* changes:
Fix bug
2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher. - Ensure system IMEs are put on the enabled list at startup/install. - If the default IME is not installed, choose another one whenever building input method list.
Dirk Dougherty [Thu, 15 Oct 2009 00:59:32 +0000 (17:59 -0700)]
doc change: edits to the screens support doc.
Bug:
2160782
Dirk Dougherty [Sat, 10 Oct 2009 00:14:28 +0000 (17:14 -0700)]
doc change only: add screens support doc
Scott Main [Fri, 9 Oct 2009 19:38:41 +0000 (12:38 -0700)]
docs only.
fix some typos.
Brandon Ballinger [Wed, 21 Oct 2009 07:38:13 +0000 (00:38 -0700)]
Fix bug
2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher.
- Ensure system IMEs are put on the enabled list at startup/install.
- If the default IME is not installed, choose another one whenever building input method list.
jsh [Thu, 22 Oct 2009 00:55:31 +0000 (17:55 -0700)]
Send "encoding problem" to the network for general errors during SMS dispatch.
Previously we were returning "other terminal problem" to the network, but this
had the potential of blocking MT SMS messages for days at a time (eg, if the
problematic message is resent). Sending the "encoding problem" cause code is
reasonable since in most cases the we have encountered an error while trying
to parse the message.
Addresses b/
2200412.
Android (Google) Code Review [Wed, 21 Oct 2009 22:56:10 +0000 (18:56 -0400)]
Merge change I1538dba4 into eclair
* changes:
Make FWK start a wifi scan if supplicant forgets. (do not merge)
Android (Google) Code Review [Wed, 21 Oct 2009 22:18:30 +0000 (18:18 -0400)]
Merge change I13dd02fc into eclair
* changes:
telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
Android (Google) Code Review [Wed, 21 Oct 2009 22:15:20 +0000 (18:15 -0400)]
Merge change I7a03b074 into eclair
* changes:
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Andreas Huber [Wed, 21 Oct 2009 22:06:21 +0000 (15:06 -0700)]
Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
Robert Greenwalt [Thu, 8 Oct 2009 00:57:49 +0000 (17:57 -0700)]
Make FWK start a wifi scan if supplicant forgets. (do not merge)
Waits 15sec after getting a DISCONNECTED or INACTIVE state. Also tracks
the number of supplicant state transitions. After the period is up
if we haven't received any more supplicant state transitions, it requests a scan.
bug:
2168081
Naveen Kalla [Mon, 12 Oct 2009 18:08:52 +0000 (11:08 -0700)]
telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
When Android Telephony receives response to GET_REGISTRATION_STATE
message from RIL it may contain few fields set to NULL. Due to a parsing
exception encountered while parsing that field, the remaining fields will
not be parsed even if they are valid data. Ignore all fields that are NULL
while letting it parse non-NULL data.
For Latitude and Longitude, the values should not be hexadecimal. They
shall be parsed as decimal values as specified in the 3GPP2 C.S0005-A
specification. Invalid value is changed from -1 to Integer.MAX_VALUE.
Bug:
2201613
Change-Id: I13dd02fcfa2ae7fcb6f21c4b94b830786bd7270c
Leon Scroggins [Wed, 21 Oct 2009 20:18:15 +0000 (13:18 -0700)]
am
f8e3ac85: Merge change Ifa8ab30e into eclair
Merge commit '
f8e3ac851959efbd21da930a802f8efb65ccec5b' into eclair-plus-aosp
* commit '
f8e3ac851959efbd21da930a802f8efb65ccec5b':
In onKeyUp for DPAD_CENTER, show the IME for text input.
Android (Google) Code Review [Wed, 21 Oct 2009 20:11:23 +0000 (16:11 -0400)]
Merge change Ifa8ab30e into eclair
* changes:
In onKeyUp for DPAD_CENTER, show the IME for text input.
Leon Scroggins [Wed, 21 Oct 2009 19:35:33 +0000 (15:35 -0400)]
In onKeyUp for DPAD_CENTER, show the IME for text input.
Fixes http://b/issue?id=
2201966
Change-Id: Ifa8ab30e205e21e9e69e9a7405a0a6fc86c6c488
Eric Fischer [Wed, 21 Oct 2009 19:19:19 +0000 (12:19 -0700)]
am
2cb6b7fb: Merge change Ic4bf942c into eclair
Merge commit '
2cb6b7fb868899a3c718280605b0e462d0f8491f' into eclair-plus-aosp
* commit '
2cb6b7fb868899a3c718280605b0e462d0f8491f':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 21 Oct 2009 19:09:58 +0000 (15:09 -0400)]
Merge change Ic4bf942c into eclair
* changes:
Import revised translations. DO NOT MERGE
Jack Palevich [Wed, 21 Oct 2009 18:58:36 +0000 (11:58 -0700)]
am
785768a9: Merge change Id443ba45 into eclair
Merge commit '
785768a9216b3a631237587feffea2aeb05a91cc' into eclair-plus-aosp
* commit '
785768a9216b3a631237587feffea2aeb05a91cc':
Prevent transparent region from getting out of sync with Surface Flinger
Android (Google) Code Review [Wed, 21 Oct 2009 18:04:26 +0000 (14:04 -0400)]
Merge change Id443ba45 into eclair
* changes:
Prevent transparent region from getting out of sync with Surface Flinger
Eric Fischer [Wed, 21 Oct 2009 17:41:17 +0000 (10:41 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jack Palevich [Sat, 10 Oct 2009 00:37:50 +0000 (17:37 -0700)]
Prevent transparent region from getting out of sync with Surface Flinger
The ViewRoot is responsible for calculating the current view's surface's
transparent region and reporting this to the window server, which in
turn notifies Surface Flinger.
To minimize cross-process traffic, ViewRoot keeps track of the
most recent transparent region that it has reported to the window
server, and only sends updates when the region shape changes.
ViewRoot is effectively shadowing the internal state of the window
server, and usually this works fine, because ViewRoot is usually the
only thing that changes this value.
But when the surface is recreated, the window server resets the
transparent region to empty. So in order to properly update the window
server we need to reset our copy of its state to empty too.
Fixes issue #
2133090: GL Gears runs at half speed in some cases
Brett Chabot [Wed, 21 Oct 2009 04:59:36 +0000 (21:59 -0700)]
am
6270d52c: Merge change Ica1d7b90 into eclair
Merge commit '
6270d52c0dded8658733a392f3ef1f521bc5dbee' into eclair-plus-aosp
* commit '
6270d52c0dded8658733a392f3ef1f521bc5dbee':
Disable known failure math tanhd tests (DO NOT MERGE)
Android (Google) Code Review [Wed, 21 Oct 2009 04:48:41 +0000 (00:48 -0400)]
Merge change Ica1d7b90 into eclair
* changes:
Disable known failure math tanhd tests (DO NOT MERGE)
Jeff Sharkey [Tue, 20 Oct 2009 23:34:05 +0000 (16:34 -0700)]
am
9aa7e4e7: am
d7bc6546: Fix spacing to escape "false" correctly.
Merge commit '
9aa7e4e729b6f3c3075e762af37c259f84bfe876' into eclair-plus-aosp
* commit '
9aa7e4e729b6f3c3075e762af37c259f84bfe876':
Fix spacing to escape "false" correctly.
Dianne Hackborn [Tue, 20 Oct 2009 23:20:41 +0000 (16:20 -0700)]
am
8d9ddbe2: Merge change I1f30f3f1 into eclair
Merge commit '
8d9ddbe2aa3db86237880102ccf320945e7f57d3' into eclair-plus-aosp
* commit '
8d9ddbe2aa3db86237880102ccf320945e7f57d3':
Fix #
2201615: getCallingPackage returns calling process instead of calling package
Jeff Sharkey [Tue, 20 Oct 2009 23:20:36 +0000 (16:20 -0700)]
am
d7bc6546: Fix spacing to escape "false" correctly.
Merge commit '
d7bc6546268ccc21954427a3ef56f6365bacef5a' into eclair
* commit '
d7bc6546268ccc21954427a3ef56f6365bacef5a':
Fix spacing to escape "false" correctly.
Android (Google) Code Review [Tue, 20 Oct 2009 23:14:20 +0000 (19:14 -0400)]
Merge change I1f30f3f1 into eclair
* changes:
Fix #
2201615: getCallingPackage returns calling process instead of calling package
Suchi Amalapurapu [Tue, 20 Oct 2009 23:04:14 +0000 (16:04 -0700)]
am
5b48223d: Merge change I14e833fa into eclair
Merge commit '
5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-plus-aosp
* commit '
5b48223d0e8b8becea0c120895d964e6472b3552':
If we fail to persist the current settings and fall back to the back settings file
Jeff Sharkey [Tue, 20 Oct 2009 22:57:43 +0000 (15:57 -0700)]
Fix spacing to escape "false" correctly.
Android (Google) Code Review [Tue, 20 Oct 2009 22:51:06 +0000 (18:51 -0400)]
Merge change I14e833fa into eclair
* changes:
If we fail to persist the current settings and fall back to the back settings file when reading settings in PackageManager, we might rename the corrupted settings to backup(in case of power failure between the earlier write failure and file deletion) and end up loosing both files. So just clear up the corrupted current settings file if we have backup. The backup wouldn't exist if everything went well with persisting the earlier settings.
Dianne Hackborn [Tue, 20 Oct 2009 22:42:38 +0000 (15:42 -0700)]
Fix #
2201615: getCallingPackage returns calling process instead of calling package
Change-Id: I1f30f3f1ce8928796c1ab502d0c2dc02de86e8e7
Brett Chabot [Tue, 20 Oct 2009 21:09:28 +0000 (14:09 -0700)]
Disable known failure math tanhd tests (DO NOT MERGE)
BUG
2139334
Doug Zongker [Tue, 20 Oct 2009 20:36:06 +0000 (13:36 -0700)]
am
617262d8: Merge change I37c4157d into eclair
Merge commit '
617262d8f57362536ddc00a070c1c0994741de44' into eclair-plus-aosp
* commit '
617262d8f57362536ddc00a070c1c0994741de44':
add "junk path" -k option to aapt (DO NOT MERGE)
Android (Google) Code Review [Tue, 20 Oct 2009 20:28:05 +0000 (16:28 -0400)]
Merge change I37c4157d into eclair
* changes:
add "junk path" -k option to aapt (DO NOT MERGE)
Suchi Amalapurapu [Tue, 20 Oct 2009 18:27:32 +0000 (11:27 -0700)]
If we fail to persist the current settings and fall back to the back settings file
when reading settings in PackageManager, we might rename the corrupted settings to
backup(in case of power failure between the earlier write failure and file deletion)
and end up loosing both files.
So just clear up the corrupted current settings file if we have backup.
The backup wouldn't exist if everything went well with persisting the earlier settings.
We do this in both read and write just in case.
Andreas Huber [Tue, 20 Oct 2009 20:02:05 +0000 (13:02 -0700)]
am
ca404dfb: Merge change Ie3ffb526 into eclair
Merge commit '
ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-plus-aosp
* commit '
ca404dfb920ab009cef4db5e74715b796f79b3f9':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Brett Chabot [Tue, 20 Oct 2009 20:01:55 +0000 (13:01 -0700)]
am
76bb9a36: Merge change I1932e8f8 into eclair
Merge commit '
76bb9a363633b5741937ebe58b01a8b2024753b0' into eclair-plus-aosp
* commit '
76bb9a363633b5741937ebe58b01a8b2024753b0':
Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
Android (Google) Code Review [Tue, 20 Oct 2009 19:52:29 +0000 (15:52 -0400)]
Merge change Ie3ffb526 into eclair
* changes:
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Android (Google) Code Review [Tue, 20 Oct 2009 19:13:05 +0000 (15:13 -0400)]
Merge change I1932e8f8 into eclair
* changes:
Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
Andreas Huber [Tue, 20 Oct 2009 17:43:48 +0000 (10:43 -0700)]
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Add a quirk mode to OMXCodec that makes it aware of this fact for proper display. Also integrate back a change from eclair-mr2 that delays releasing an output buffer briefly after posting it to surface flinger, as we don't know how long it'll take it to actually display the buffer's content.
Dianne Hackborn [Tue, 20 Oct 2009 18:35:25 +0000 (11:35 -0700)]
am
61462b43: Merge change I1864d098 into eclair
Merge commit '
61462b437067a591bfc52c498ad964e566aaffac' into eclair-plus-aosp
* commit '
61462b437067a591bfc52c498ad964e566aaffac':
Improve wallpaper offset handling.
Dianne Hackborn [Tue, 20 Oct 2009 18:28:45 +0000 (11:28 -0700)]
am
359f0b09: Merge change Ib5736616 into eclair
Merge commit '
359f0b0998c26d2501346334d8850a2248920f0f' into eclair-plus-aosp
* commit '
359f0b0998c26d2501346334d8850a2248920f0f':
Fix issue #
2191572: Difficulties drawing window shade
Marco Nelissen [Tue, 20 Oct 2009 18:28:35 +0000 (11:28 -0700)]
am
cdc8b326: Merge change I61741f5a into eclair
Merge commit '
cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-plus-aosp
* commit '
cdc8b326dd0989003e2fdd7d5a605b5755acf221':
Fix high density bug
2179543: use 'dip' instead of 'px'
Android (Google) Code Review [Tue, 20 Oct 2009 18:27:55 +0000 (14:27 -0400)]
Merge change I1864d098 into eclair
* changes:
Improve wallpaper offset handling.
Android (Google) Code Review [Tue, 20 Oct 2009 18:22:37 +0000 (14:22 -0400)]
Merge change Ib5736616 into eclair
* changes:
Fix issue #
2191572: Difficulties drawing window shade
Android (Google) Code Review [Tue, 20 Oct 2009 17:10:42 +0000 (13:10 -0400)]
Merge change I61741f5a into eclair
* changes:
Fix high density bug
2179543: use 'dip' instead of 'px'
Mike Lockwood [Tue, 20 Oct 2009 15:47:37 +0000 (08:47 -0700)]
am
fa68ab4f: PowerManagerService: Add missing synchronization in mAutoBrightnessTask.
Merge commit '
fa68ab4fb0750b429c43af1d0c20539462ba6746' into eclair-plus-aosp
* commit '
fa68ab4fb0750b429c43af1d0c20539462ba6746':
PowerManagerService: Add missing synchronization in mAutoBrightnessTask.
Mike Lockwood [Tue, 20 Oct 2009 15:08:49 +0000 (11:08 -0400)]
PowerManagerService: Add missing synchronization in mAutoBrightnessTask.
Change-Id: Ie9b93253e991f709b223b28a9148be3b254fb273
Signed-off-by: Mike Lockwood <lockwood@android.com>
Marco Nelissen [Mon, 19 Oct 2009 23:41:21 +0000 (16:41 -0700)]
Fix high density bug
2179543: use 'dip' instead of 'px'
Mike Lockwood [Tue, 20 Oct 2009 13:07:50 +0000 (06:07 -0700)]
am
6c97fcab: Power Manager light sensor fixes:
Merge commit '
6c97fcabbc4592a115afa5f3357b3172c4791855' into eclair-plus-aosp
* commit '
6c97fcabbc4592a115afa5f3357b3172c4791855':
Power Manager light sensor fixes:
Mike Lockwood [Tue, 20 Oct 2009 12:10:00 +0000 (08:10 -0400)]
Power Manager light sensor fixes:
Fix problem with ignored sensor events right after screen turns on.
Do not flash button backlights when device is booting.
Process the first light sensor change after waking the screen immediately rather than debouncing.
Cancel mAutoBrightnessTask when light sensor is disabled.
Change-Id: Iffc5e090b239432b7643812fa8ecb5f69da1679d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 20 Oct 2009 02:59:19 +0000 (19:59 -0700)]
am
d7786b41: Power Manager support for light sensor backlight management.
Merge commit '
d7786b41b78ba8592daea708b024b5a75e441992' into eclair-plus-aosp
* commit '
d7786b41b78ba8592daea708b024b5a75e441992':
Power Manager support for light sensor backlight management.
jsh [Tue, 20 Oct 2009 02:59:10 +0000 (19:59 -0700)]
am
cea8f8e4: Merge change I4219797a into eclair
Merge commit '
cea8f8e4a8506678c0255763f46d1f6577f991a1' into eclair-plus-aosp
* commit '
cea8f8e4a8506678c0255763f46d1f6577f991a1':
Log exception if we hit an error parsing an incoming SMS message.
Mike Lockwood [Fri, 16 Oct 2009 00:09:16 +0000 (17:09 -0700)]
Power Manager support for light sensor backlight management.
Change-Id: I470e2d7d12abf0dbfd31d84859b06bfae3cb36a1
Signed-off-by: Mike Lockwood <lockwood@android.com>
Brett Chabot [Tue, 20 Oct 2009 00:34:33 +0000 (17:34 -0700)]
Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
BUG
2170975
Doug Zongker [Tue, 20 Oct 2009 00:04:21 +0000 (17:04 -0700)]
add "junk path" -k option to aapt (DO NOT MERGE)
Adds a "junk path" option to aapt so that you can do:
aapt add -k archive.zip path/to/some.file
and have the file stored in the zip under the name "some.file"
(without the path). Needed so that we can use 'aapt add' in place of
'zip -j' when building jar files, which will lead to smaller
incremental OTAs.
(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
Android (Google) Code Review [Mon, 19 Oct 2009 23:38:56 +0000 (19:38 -0400)]
Merge change I4219797a into eclair
* changes:
Log exception if we hit an error parsing an incoming SMS message.
Mathias Agopian [Mon, 19 Oct 2009 23:26:56 +0000 (16:26 -0700)]
am
b34d5d52: Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit '
b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-plus-aosp
* commit '
b34d5d527596102ae7a040d787e4d8c336bf192b':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Mathias Agopian [Wed, 14 Oct 2009 09:39:53 +0000 (02:39 -0700)]
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
this will be needed for SMP, but would improve dispatching GL calls a bit
on armv6 and above.