Commit Graph

5959 Commits

Author SHA1 Message Date
Android (Google) Code Review
8b5e7153a5 Merge change I3ae1fb19 into eclair-mr2
* changes:
  Increase the default wake lock timeout.
2009-11-20 14:56:21 -08:00
Evan Millar
c1a5945f8b am 633177cb: Move updated 6.xml from eclair-sholes-release into eclair
Merge commit '633177cbdc21b9e8f2153069965fb6aa30b8cb8f' into eclair-mr2

* commit '633177cbdc21b9e8f2153069965fb6aa30b8cb8f':
  Move updated 6.xml from eclair-sholes-release into eclair
2009-11-20 14:22:30 -08:00
Mike Lockwood
fc0c6e00d1 am a1ce6551: Merge change I69324a33 into eclair
Merge commit 'a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2' into eclair-mr2

* commit 'a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2':
  AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:32:17 -08:00
Android (Google) Code Review
24e763c21a Merge change I69324a33 into eclair
* changes:
  AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:28:12 -08:00
Dirk Dougherty
1ac40cdfdc am 055b4392: Merge change I0a17a960 into eclair
Merge commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d' into eclair-mr2

* commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d':
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:13:25 -08:00
Android (Google) Code Review
e4054e1a4c Merge change I0a17a960 into eclair
* changes:
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:08:06 -08:00
Yu Shan Emily Lau
5d1b4f25b5 am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2

* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
  Add the checking for mediaplayer stress test.
2009-11-20 12:03:34 -08:00
Android (Google) Code Review
2840dde56b Merge change Ib3191441 into eclair
* changes:
  Add the checking for mediaplayer stress test.
2009-11-20 11:59:28 -08:00
Scott Main
49a98fa51b am 2a6a149f: am 820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc' into eclair-mr2

* commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc':
  docs change for ESD: add samples html pages for offline docs
2009-11-20 10:00:55 -08:00
Scott Main
adea3166b5 am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2

* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:00:28 -08:00
Scott Main
35f28c7d40 am 820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '820a4e7dd6adeff162a92ca40ebe2f109561036b' into eclair

* commit '820a4e7dd6adeff162a92ca40ebe2f109561036b':
  docs change for ESD: add samples html pages for offline docs
2009-11-20 09:54:52 -08:00
Scott Main
e6102458d5 am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair

* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 09:54:22 -08:00
Android (Google) Code Review
6e86c8ce85 Merge change I903ce7b1 into eclair-mr2
* changes:
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:14:37 -08:00
Joe Onorato
779eec250c am 57bda83d: Merge change I4f614c9e into eclair
Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-mr2

* commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 21:20:18 -08:00
Android (Google) Code Review
716534ba06 Merge change I4f614c9e into eclair
* changes:
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 20:17:06 -08:00
Mathias Agopian
8386ce0d5b am 13feccf5: Merge change I39f0003e into eclair
Merge commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-mr2

* commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae':
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:07:36 -08:00
Android (Google) Code Review
1a1ce3a6a2 Merge change I39f0003e into eclair
* changes:
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:03:53 -08:00
Android (Google) Code Review
cfab3008e1 Merge change I27b1bb90 into eclair-mr2
* changes:
  Refactor vCard test code and modify unit tests.
2009-11-19 18:50:48 -08:00
Dianne Hackborn
57972134c5 am 524812fb: Merge change I7d40ad9a into eclair
Merge commit '524812fbf583db5053ff56f7a146fa8fe9296742' into eclair-mr2

* commit '524812fbf583db5053ff56f7a146fa8fe9296742':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:06:06 -08:00
Android (Google) Code Review
5855937862 Merge change I7d40ad9a into eclair
* changes:
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:01:30 -08:00
Mathias Agopian
a750fc0bf8 fix [2235414] libagl glDeleteBuffers() crashes
don't dereference null pointers, would happen if one of the array wasn't bound.
2009-11-19 17:32:05 -08:00
Mathias Agopian
4c20530387 am 23aa34a7: Merge change I137dac6f into eclair
Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-mr2

* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
  backout a workaround that is not needed anymore
2009-11-19 16:29:30 -08:00
Mike Chan
e9389bad71 am 23b3ef82: Merge change I99194df1 into eclair
Merge commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7' into eclair-mr2

* commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7':
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
2009-11-19 16:23:56 -08:00
Android (Google) Code Review
66112b114d Merge change I137dac6f into eclair
* changes:
  backout a workaround that is not needed anymore
2009-11-19 16:23:29 -08:00
Android (Google) Code Review
3250af908d Merge change I99194df1 into eclair
* changes:
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
2009-11-19 16:18:51 -08:00
Mathias Agopian
60f5d3694b backout a workaround that is not needed anymore
we had to add a call to glFinish() before glReadPixels() because of a bug in the GL ES
driver of a certain device. This is not needed anymore.
2009-11-19 15:52:28 -08:00
Mathias Agopian
b5e90e218b am 74a331b5: Merge change I4c29c948 into eclair
Merge commit '74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-mr2

* commit '74a331b5dd1d39da44b608743c36ab3523f598d2':
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
2009-11-19 15:47:37 -08:00
Android (Google) Code Review
48d2c6051e Merge change I4c29c948 into eclair
* changes:
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
2009-11-19 15:44:13 -08:00
Andreas Huber
8501b1dca3 am f854e077: (-s ours) Merge change I8134d6ed into eclair
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-mr2

* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
2009-11-19 15:01:14 -08:00
Jason Sams
d16a2223ad am ddac83a5: Fix extended logging for object dumping.
Merge commit 'ddac83a516e939b55f20b226365596760159c9df' into eclair-mr2

* commit 'ddac83a516e939b55f20b226365596760159c9df':
  Fix extended logging for object dumping.
2009-11-19 14:56:39 -08:00
Android (Google) Code Review
ae5f30aed3 Merge change I8134d6ed into eclair
* changes:
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
2009-11-19 14:52:57 -08:00
Mathias Agopian
713795a2e0 fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Make sure to always enable linear filtering in LayerBuffer. This change doesn't affect
devices using overlays.
2009-11-19 14:46:26 -08:00
Android (Google) Code Review
35cc19ba12 Merge change I639b0f03 into eclair-mr2
* changes:
  Make vCard exporter append neighborhood to locality field instead of extended address, per China convention.
2009-11-19 14:13:31 -08:00
Android (Google) Code Review
7bcd6eaac3 Merge change I86773fbb into eclair-mr2
* changes:
  If overview width is the same as the current width, don't change the mode when double tap or zoom out.
2009-11-19 13:47:24 -08:00
Fred Quintana
d00412c23d am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-mr2

* commit '5994cd2898ad3c76d1f5068137a884024f521163':
  -hide AccountManagerResponse, which never should have been exposed in the first place
2009-11-19 11:41:48 -08:00
Dianne Hackborn
fe2c1b3efe am e4260f4e: Fix build.
Merge commit 'e4260f4e7da4da32bfab2737018cf9cf75215894' into eclair-mr2

* commit 'e4260f4e7da4da32bfab2737018cf9cf75215894':
  Fix build.
2009-11-19 11:40:48 -08:00
Android (Google) Code Review
9232f6a971 Merge change I194f0808 into eclair-mr2
* changes:
  Add Gservices flag so that Market can turn on performance logging for specific groups.
2009-11-19 11:36:42 -08:00
Dianne Hackborn
bf1129e1b0 am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs
Merge commit '23ef7b4836d66d31430fedee2aac36275bb30d4b' into eclair-mr2

* commit '23ef7b4836d66d31430fedee2aac36275bb30d4b':
  Fix most of issue #2271640: Fix wallpaper etc docs
2009-11-19 11:09:11 -08:00
Android (Google) Code Review
0ec44fdc33 Merge change I09e159ce into eclair-mr2
* changes:
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
2009-11-19 09:08:22 -08:00
Android (Google) Code Review
2b930b9351 Merge change Ifd754059 into eclair-mr2
* changes:
  Make vCard code refrain from using NEIGHBORHOOD field when importing.
2009-11-18 18:23:21 -08:00
Android (Google) Code Review
bccac13afa Merge change I3a62e1c2 into eclair-mr2
* changes:
  Solve the mutual interdependency problem between common and framework: Have framework include the common source files directly when building, then build common as a static library separately (depending on framework, like everything else).
2009-11-18 17:23:19 -08:00
Scott Main
522c0407bd am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8' into eclair-mr2

* commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8':
  docs: misc edits to samples page and intro docs
2009-11-18 17:18:16 -08:00
Scott Main
574917c87f am afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit 'afcd516e3e6378aaf97ff44b0b9ea233223ded65' into eclair

* commit 'afcd516e3e6378aaf97ff44b0b9ea233223ded65':
  docs: misc edits to samples page and intro docs
2009-11-18 17:12:35 -08:00
Jean-Michel Trivi
327561b2fb am a0e37e9d: Merge change I941136fd into eclair
Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-mr2

* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:04:30 -08:00
Android (Google) Code Review
8355ab6a49 Merge change I941136fd into eclair
* changes:
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource to define how the two new audio sources behave when used on devices that don't support them.
2009-11-18 17:00:16 -08:00
Mike Lockwood
2559c05abe am 03786b83: Merge change I813fdb7a into eclair
Merge commit '03786b83bd02f8dd8e1049d333fbfdee395ac965' into eclair-mr2

* commit '03786b83bd02f8dd8e1049d333fbfdee395ac965':
  Fixes for proximity sensor behavior:
2009-11-18 16:24:37 -08:00
Android (Google) Code Review
0e6eff4a20 Merge change I813fdb7a into eclair
* changes:
  Fixes for proximity sensor behavior:
2009-11-18 16:20:32 -08:00
Android (Google) Code Review
4bddbfa258 Merge change I8daabf26 into eclair-mr2
* changes:
  Modify vCard exporter code so that it does not emit non-Ascii type.
2009-11-18 16:11:35 -08:00
Dianne Hackborn
a6d7a9f498 am dfc066e7: Merge change I5ad37324 into eclair
Merge commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f' into eclair-mr2

* commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
2009-11-18 15:12:59 -08:00
Android (Google) Code Review
ba11cf6259 Merge change I5ad37324 into eclair
* changes:
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
2009-11-18 15:09:18 -08:00