Commit Graph

6966 Commits

Author SHA1 Message Date
Android (Google) Code Review
89e6154f8b Merge change I66ff8af6 into eclair-mr2
* changes:
  Move calc of EriIconIndex/Mode to whenever basis changes
2009-10-21 20:45:37 -04:00
Robert Greenwalt
d1c7a6f31f am a86f1ccc: Merge change Ie2d155a5 into eclair-mr2
Merge commit 'a86f1ccca0bf54f27c398b4dbb0f2f1ec7293315' into eclair-mr2-plus-aosp

* commit 'a86f1ccca0bf54f27c398b4dbb0f2f1ec7293315':
  Add a new API for initing Wifi multicast filtering
2009-10-21 16:50:46 -07:00
Android (Google) Code Review
d13596a331 Merge change Ie2d155a5 into eclair-mr2
* changes:
  Add a new API for initing Wifi multicast filtering
2009-10-21 19:44:30 -04:00
Daisuke Miyakawa
38955707aa am 54616f34: Make MockCursor class a part of public SDK.
Merge commit '54616f3435e67029006d2f77462c61ed0635a3f6' into eclair-mr2-plus-aosp

* commit '54616f3435e67029006d2f77462c61ed0635a3f6':
  Make MockCursor class a part of public SDK.
2009-10-21 16:10:24 -07:00
Android (Google) Code Review
c1b2b3d61e Merge change I1538dba4 into eclair
* changes:
  Make FWK start a wifi scan if supplicant forgets. (do not merge)
2009-10-21 18:56:10 -04:00
Andreas Huber
03b83a1ecd am bfd5b386: Merge change If68c168d into eclair-mr2
Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp

* commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe':
  Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
2009-10-21 15:24:07 -07:00
Android (Google) Code Review
eb409f7cba Merge change I13dd02fc into eclair
* changes:
  telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
2009-10-21 18:18:30 -04:00
Android (Google) Code Review
7617b917b8 Merge change If68c168d into eclair-mr2
* changes:
  Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
2009-10-21 18:17:01 -04:00
Android (Google) Code Review
0d2ad405e5 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.
2009-10-21 18:15:20 -04:00
Android (Google) Code Review
d304153d35 Merge change Ifa8ab30e into eclair
* changes:
  In onKeyUp for DPAD_CENTER, show the IME for text input.
2009-10-21 16:11:23 -04:00
Eric Laurent
63da2b65f9 Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Added setVoiceVolume() method to AudioSystem, AudioFlinger, IAudioFlinger, AudioPolicyService.
Removed call to AudioHardwareInterface::setVoiceVolume() from AudioFlinger::setStreamVolume().
2009-10-21 12:29:37 -07:00
Android (Google) Code Review
381d519aad Merge change Ic4bf942c into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-10-21 15:09:58 -04:00
Grace Kloba
304653ba7c am 3f9faf47: When WebView has wrap_content, we are sending WebKit 0 height to get the exact height. But if the View system doesn\'t think the WebView dimension changed, even we call requestLayout, we won\'t get onSizeChanged. So we never notify the WebKit about the fina
Merge commit '3f9faf473712be7d6471913b921bf8a63ab3205d' into eclair-mr2-plus-aosp

* commit '3f9faf473712be7d6471913b921bf8a63ab3205d':
  When WebView has wrap_content, we are sending WebKit
2009-10-21 11:59:50 -07:00
Leon Scroggins
348783aceb am 2f3dc5b9: Merge change If1e1fb39 into eclair-mr2
Merge commit '2f3dc5b9ce0e3907e529c88728b166d66beccab5' into eclair-mr2-plus-aosp

* commit '2f3dc5b9ce0e3907e529c88728b166d66beccab5':
  Draw dividers between <optgroup> and <option> elements.
2009-10-21 11:59:32 -07:00
Cary Clark
5fa1a6016e am 7a719785: Merge change Ifcafa460 into eclair-mr2
Merge commit '7a7197853de1b8aea0945b5b72e0eb12b2837b50' into eclair-mr2-plus-aosp

* commit '7a7197853de1b8aea0945b5b72e0eb12b2837b50':
  fix multiple text areas, and text areas without focus rings
2009-10-21 11:59:20 -07:00
Android (Google) Code Review
e20e6f9f0e Merge change If1e1fb39 into eclair-mr2
* changes:
  Draw dividers between <optgroup> and <option> elements.
2009-10-21 14:15:54 -04:00
Android (Google) Code Review
48904353c2 Merge change Ifcafa460 into eclair-mr2
* changes:
  fix multiple text areas, and text areas without focus rings
2009-10-21 14:14:46 -04:00
Android (Google) Code Review
c0151f27ad Merge change Id443ba45 into eclair
* changes:
  Prevent transparent region from getting out of sync with Surface Flinger
2009-10-21 14:04:26 -04:00
Jack Palevich
5afdc87704 Add size checks for glBufferData and glBufferSubData
Without the size checks it's possible for calls to glBufferData
and glBufferSubData to read off the end of the Buffer object's
data, which can cause page faults.

Fix end-of-line characters for the "spec" files. (That's why
every line of these files is changed.)

Enhance our code emitter to properly handle bounds checks for
possibly-null pointers.
2009-10-21 11:02:44 -07:00
Leon Scroggins
cbdace9600 am a8da1735: Do not show radio/checkboxes for <optgroup> labels.
Merge commit 'a8da17356f9a385e097e3eef205358462d214538' into eclair-mr2-plus-aosp

* commit 'a8da17356f9a385e097e3eef205358462d214538':
  Do not show radio/checkboxes for <optgroup> labels.
2009-10-21 07:21:57 -07:00
Tammo Spalink
99f0abe55f am 8785c064: Merge change Ie5df08ef into eclair-mr2
Merge commit '8785c064fab3429c792ac160aeeb19e9926382f0' into eclair-mr2-plus-aosp

* commit '8785c064fab3429c792ac160aeeb19e9926382f0':
  Let PLUS occur once anywhere in dial-str network portion.
2009-10-21 00:37:00 -07:00
Android (Google) Code Review
f36de8c2e0 Merge change Ie5df08ef into eclair-mr2
* changes:
  Let PLUS occur once anywhere in dial-str network portion.
2009-10-21 03:27:14 -04:00
Android (Google) Code Review
47bd9427f9 Merge change Ica1d7b90 into eclair
* changes:
  Disable known failure math tanhd tests  (DO NOT MERGE)
2009-10-21 00:48:41 -04:00
Jeff Sharkey
3b43a2139d am d7bc6546: Fix spacing to escape "false" correctly.
Merge commit 'd7bc6546268ccc21954427a3ef56f6365bacef5a' into eclair

* commit 'd7bc6546268ccc21954427a3ef56f6365bacef5a':
  Fix spacing to escape "false" correctly.
2009-10-20 16:20:36 -07:00
Android (Google) Code Review
2364ae3160 Merge change I1f30f3f1 into eclair
* changes:
  Fix #2201615: getCallingPackage returns calling process instead of calling package
2009-10-20 19:14:20 -04:00
Android (Google) Code Review
068fc95640 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.
2009-10-20 18:51:06 -04:00
Dan Egnor
990d48686a am 2a2805b7: Merge change Ib3b06fc3 into eclair-mr2
Merge commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5' into eclair-mr2-plus-aosp

* commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5':
  It turns out to be useful to allow enumeration on a per-tag basis,
2009-10-20 13:29:31 -07:00
Android (Google) Code Review
7793548d0a Merge change I37c4157d into eclair
* changes:
  add "junk path" -k option to aapt (DO NOT MERGE)
2009-10-20 16:28:05 -04:00
Android (Google) Code Review
6e3a012304 Merge change Ib3b06fc3 into eclair-mr2
* changes:
  It turns out to be useful to allow enumeration on a per-tag basis, and it's easy to support based on the data structures we have, so add a tag parameter to getNextEvent().
2009-10-20 16:23:01 -04:00
Android (Google) Code Review
cbc92d7b91 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.
2009-10-20 15:52:29 -04:00
Cary Clark
7c11fe0d44 am ac492e18: tweak snap scroll
Merge commit 'ac492e181a21749858ebf30dc1f5bcb0ded4383c' into eclair-mr2-plus-aosp

* commit 'ac492e181a21749858ebf30dc1f5bcb0ded4383c':
  tweak snap scroll
2009-10-20 12:28:56 -07:00
Cary Clark
0b68137caa am 5af4cf47: Merge change I4958d608 into eclair-mr2
Merge commit '5af4cf47b94383deb47648240036c7090f46fd41' into eclair-mr2-plus-aosp

* commit '5af4cf47b94383deb47648240036c7090f46fd41':
  add dpad control of text selection for sholes
2009-10-20 12:18:56 -07:00
Dianne Hackborn
5bc60bae01 am a8f1a805: am 61462b43: Merge change I1864d098 into eclair
Merge commit 'a8f1a805c8b6dff5becbd95122462d91c1d1b254' into eclair-mr2-plus-aosp

* commit 'a8f1a805c8b6dff5becbd95122462d91c1d1b254':
  Improve wallpaper offset handling.
2009-10-20 12:18:46 -07:00
Dianne Hackborn
c07cf6e0da am cc62ee77: am 359f0b09: Merge change Ib5736616 into eclair
Merge commit 'cc62ee77d3253c7b4e454a849a771826bc35f57f' into eclair-mr2-plus-aosp

* commit 'cc62ee77d3253c7b4e454a849a771826bc35f57f':
  Fix issue #2191572: Difficulties drawing window shade
2009-10-20 12:18:35 -07:00
Marco Nelissen
d18083cfa6 am 32de9130: am cdc8b326: Merge change I61741f5a into eclair
Merge commit '32de91306233b08604ce7a158a37235c7042ae13' into eclair-mr2-plus-aosp

* commit '32de91306233b08604ce7a158a37235c7042ae13':
  Fix high density bug 2179543: use 'dip' instead of 'px'
2009-10-20 12:18:24 -07:00
Android (Google) Code Review
3d5b3c099f Merge change I1932e8f8 into eclair
* changes:
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
2009-10-20 15:13:05 -04:00
Android (Google) Code Review
010891dc43 Merge change I4958d608 into eclair-mr2
* changes:
  add dpad control of text selection for sholes
2009-10-20 15:09:51 -04:00
Dianne Hackborn
d2e65ef9f6 am 61462b43: Merge change I1864d098 into eclair
Merge commit '61462b437067a591bfc52c498ad964e566aaffac' into eclair-mr2

* commit '61462b437067a591bfc52c498ad964e566aaffac':
  Improve wallpaper offset handling.
2009-10-20 11:34:47 -07:00
Dianne Hackborn
32b1d91395 am 359f0b09: Merge change Ib5736616 into eclair
Merge commit '359f0b0998c26d2501346334d8850a2248920f0f' into eclair-mr2

* commit '359f0b0998c26d2501346334d8850a2248920f0f':
  Fix issue #2191572: Difficulties drawing window shade
2009-10-20 11:29:39 -07:00
Marco Nelissen
0ac608fb54 am cdc8b326: Merge change I61741f5a into eclair
Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-mr2

* commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221':
  Fix high density bug 2179543: use 'dip' instead of 'px'
2009-10-20 11:29:26 -07:00
Android (Google) Code Review
82bd3ac45c Merge change I1864d098 into eclair
* changes:
  Improve wallpaper offset handling.
2009-10-20 14:27:55 -04:00
Android (Google) Code Review
1d4d11e4f3 Merge change Ib5736616 into eclair
* changes:
  Fix issue #2191572: Difficulties drawing window shade
2009-10-20 14:22:37 -04:00
Grace Kloba
3cedd71f08 am 12a19551: Merge change I58def690 into eclair-mr2
Merge commit '12a19551dd106b04898d262807213ce4c6d1e5f7' into eclair-mr2-plus-aosp

* commit '12a19551dd106b04898d262807213ce4c6d1e5f7':
  If openOrCreateDatabase() throws an exception, delete
2009-10-20 10:13:59 -07:00
Android (Google) Code Review
a532cc803d Merge change I61741f5a into eclair
* changes:
  Fix high density bug 2179543: use 'dip' instead of 'px'
2009-10-20 13:10:42 -04:00
Android (Google) Code Review
da6b116290 Merge change I58def690 into eclair-mr2
* changes:
  If openOrCreateDatabase() throws an exception, delete the old db and re-do it. If it still fails, something bad happens, like the directory may have the different permission. Let it throw as WebView needs the db.
2009-10-20 13:03:02 -04:00
Mike Lockwood
fd6a31d60f am cf2a595f: am fa68ab4f: PowerManagerService: Add missing synchronization in mAutoBrightnessTask.
Merge commit 'cf2a595f582fe72af19f979fd2026026f7a5de65' into eclair-mr2-plus-aosp

* commit 'cf2a595f582fe72af19f979fd2026026f7a5de65':
  PowerManagerService: Add missing synchronization in mAutoBrightnessTask.
2009-10-20 09:35:31 -07:00
Mike Lockwood
31e4a4ce97 am bca5bb8a: am 6c97fcab: Power Manager light sensor fixes:
Merge commit 'bca5bb8a25c93df18f8a903e233bd266dece47c3' into eclair-mr2-plus-aosp

* commit 'bca5bb8a25c93df18f8a903e233bd266dece47c3':
  Power Manager light sensor fixes:
2009-10-20 09:35:19 -07:00
Mike Lockwood
603c65d2bd am aa033b79: am d7786b41: Power Manager support for light sensor backlight management.
Merge commit 'aa033b79714f458b47d7c3fbc45e9fe51194f533' into eclair-mr2-plus-aosp

* commit 'aa033b79714f458b47d7c3fbc45e9fe51194f533':
  Power Manager support for light sensor backlight management.
2009-10-20 09:35:10 -07:00
jsh
10b585e44f am 6ef38fb4: am cea8f8e4: Merge change I4219797a into eclair
Merge commit '6ef38fb4262356c15cad8a1957ce58d2bb5b3de6' into eclair-mr2-plus-aosp

* commit '6ef38fb4262356c15cad8a1957ce58d2bb5b3de6':
  Log exception if we hit an error parsing an incoming SMS message.
2009-10-20 09:34:59 -07:00
Mike Lockwood
ce0f5937a0 am fa68ab4f: PowerManagerService: Add missing synchronization in mAutoBrightnessTask.
Merge commit 'fa68ab4fb0750b429c43af1d0c20539462ba6746' into eclair-mr2

* commit 'fa68ab4fb0750b429c43af1d0c20539462ba6746':
  PowerManagerService: Add missing synchronization in mAutoBrightnessTask.
2009-10-20 09:22:49 -07:00