Commit Graph

6272 Commits

Author SHA1 Message Date
Android (Google) Code Review
9497c089ff Merge change Ia3acc2ee into eclair
* changes:
  Fix pairings lost on reboot.
2009-11-22 21:54:29 -08:00
Dan Egnor
a649612e68 Add OperationScheduler (and test) to the common static library;
includes new string parsing function (and test).
2009-11-21 10:09:46 -08:00
Eric Laurent
91c95f655d am e7800946: Merge change I49f02be9 into eclair
Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2

* commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:21:15 -08:00
Android (Google) Code Review
151f4f6027 Merge change I49f02be9 into eclair
* changes:
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:18:24 -08:00
Scott Main
e63efc8888 am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '256da9fb007ac0722a5b1854befda7e7bed2564e' into eclair-mr2

* commit '256da9fb007ac0722a5b1854befda7e7bed2564e':
  docs change for ESR: add platform notes document for
2009-11-20 17:08:09 -08:00
Scott Main
4933a90e0c am 160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '160ab363d738728456d561bb80d54d3448e7580a' into eclair

* commit '160ab363d738728456d561bb80d54d3448e7580a':
  docs change for ESR: add platform notes document for
2009-11-20 17:03:29 -08:00
Android (Google) Code Review
369464469f Merge change I0c172ebf into eclair-sdk
* changes:
  docs change for ESR: add platform notes document for Android 2.0.1. Also update the homepage sdk and adp announcements.
2009-11-20 16:59:57 -08:00
Dianne Hackborn
7d59cbc168 am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2

* commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d':
  Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
2009-11-20 16:43:20 -08:00
Dianne Hackborn
d653512adf am 1824ec8c: Merge change If2b0bbed into eclair
Merge commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8' into eclair-mr2

* commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8':
  Debugging for issue #2228381 android.view.InflateException
2009-11-20 15:20:34 -08:00
Android (Google) Code Review
e12c29dabb Merge change If2b0bbed into eclair
* changes:
  Debugging for issue #2228381 android.view.InflateException
2009-11-20 15:12:33 -08:00
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
Dianne Hackborn
7b92d7ec36 Debugging for issue #2228381 android.view.InflateException
Binary XML file line #37: Error inflating class <unknown> after adding a secondary account

Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future.  (Note in this
case there was no problem in the framework.)

Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
2009-11-20 14:26:42 -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
Eric Laurent
09b4ba82d7 Issue 2265163: Audio still reported routed through earpiece on sholes
This is a second attempt to fix the audio routed to earpiece syndrom.
The root cause identified this time is the crash of an application having an active AudioTrack playing on the VOICE_CALL stream type.
When this happens, the AudioTrack destructor is not called and the audio policy manager is not notified of the track stop.
Results a situation where the VOICE_CALL stream is considered as always in use by audio policy manager which makes that audio is routed to earpiece.

The fix consists in moving the track start/stop/close notification to audio policiy manager from AudioTrack to AudioFlinger Track objet.
The net result is that in the case of a client application crash, the AudioFlinger TrackHandle object (which implements the remote side of the IAudioTrack binder interface) destructor is called which in turn destroys the Track object and we can notify the audio policy manager of the track stop and removal.

The same modification is made for AudioRecord although no bug related to record has been reported yet.
Also fixed a potential problem if record stop is called while the record thread is exiting.
2009-11-19 23:57:45 -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