9740 Commits

Author SHA1 Message Date
Android (Google) Code Review
7d9735142f Merge change 27449 into eclair
* changes:
  Always consider m4a files as audio, even when they contain a video track.
2009-09-28 12:24:08 -04:00
Andrew Stadler
6585fe004e Add extension->mime type mappings
* Microsoft Office common extensions
* .xml -> text/xml
* Change existing mapping of ".pot"->"text/plain" to ".po"

Note:  We already had a definition for .pot to text/plain.  Per the
information found at <http://www.fileinfo.com/extension/pot> this is the
rarely seen "portable object file", and is often named ".po" to avoid
this same conflict.

Addresses bug # 2097457

Change-Id: I964b853fdeae77d742f627c535a8b32e0e53516a
2009-09-28 09:23:53 -07:00
Android (Google) Code Review
c18b0ebcfb Merge change 27185 into eclair
* changes:
  Add checks for double-dumping on webkit data.
2009-09-28 12:21:30 -04:00
Guang Zhu
7216047ac3 Add checks for double-dumping on webkit data.
Also some logs seem to suggest that in rare occations, a webkit dump after timeout has occured actually never hears any response back from webkit, thus causing the test app to wait forever, because the request webkit data mechanism is not protected by a timeout watchdog. So adding a explicit log print before calling webkit dump for monitoring in future test runs.
2009-09-28 09:20:20 -07:00
Marco Nelissen
1851db6804 Always consider m4a files as audio, even when they contain a video track. 2009-09-28 09:03:33 -07:00
Daniel Sandler
12482deafb am b19774d5: Updated status bar graphics (drop date 9/25/09).
Merge commit 'b19774d520bde5bb12d80417788d9a773e123c14' into eclair-plus-aosp

* commit 'b19774d520bde5bb12d80417788d9a773e123c14':
  Updated status bar graphics (drop date 9/25/09).
2009-09-28 07:46:20 -07:00
Daniel Sandler
b19774d520 Updated status bar graphics (drop date 9/25/09). 2009-09-28 10:38:38 -04:00
Andrei Popescu
7885381f9b Handle the case where GoogleLocationSettingObserver::onChange
is called after GoogleLocationSettingObserver::doNotObserve().

Fixes http://b/issue?id=2147888
2009-09-28 12:42:02 +01:00
Suchi Amalapurapu
01dbc2ed55 Cache inflated view to avoid inflation of layouts in preferences
If layout id is specified for a Preference object, convertView is set to null
in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen.
Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
2009-09-28 00:46:05 -07:00
Mathias Agopian
c87c76f6fc am 81384bf9: don\'t emit GL commands when sf is in freeze mode
Merge commit '81384bf927c47a4efa653b14273084a13e67e3ac' into eclair-plus-aosp

* commit '81384bf927c47a4efa653b14273084a13e67e3ac':
  don't emit GL commands when sf is in freeze mode
2009-09-27 23:06:42 -07:00
Mathias Agopian
81384bf927 don't emit GL commands when sf is in freeze mode
We were emitting GL commands, calling composition complete and releasing clients
without ever calling eglSwapBuffers(), which is completely wrong on non-direct
renders. This could cause transient drawing artifacts when unfreezing the
screen (upon orientaion change for instance) and could also block the clients
for ever as they are waiting for their previous buffer to be rendered.
2009-09-27 22:47:32 -07:00
Mathias Agopian
8521fe4ef2 am 1a3c8950: Merge change 27387 into eclair
Merge commit '1a3c8950394b98f6f354456830208d70e87b8bb6' into eclair-plus-aosp

* commit '1a3c8950394b98f6f354456830208d70e87b8bb6':
  fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
2009-09-27 20:23:55 -07:00
Dmitri Plotnikov
46ed741331 am a60479d2: Fixing broken javadoc.
Merge commit 'a60479d2ea7857455ebad6c56e357d00b0492364' into eclair-plus-aosp

* commit 'a60479d2ea7857455ebad6c56e357d00b0492364':
  Fixing broken javadoc.
2009-09-27 20:23:49 -07:00
Android (Google) Code Review
1a3c895039 Merge change 27387 into eclair
* changes:
  fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
2009-09-27 23:19:49 -04:00
Mathias Agopian
594d02e54a fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
Also set max swap interval to 1, which is the only supported value currently.
2009-09-27 20:18:16 -07:00
Dmitri Plotnikov
a60479d2ea Fixing broken javadoc.
Was linking to a hidden interface.

Change-Id: Iff48cb97ed4078b2b91bade9a47d7afc5d7891bf
2009-09-27 20:16:37 -07:00
Dmitri Plotnikov
8e8ee1fd72 am 879664e3: Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit '879664e3e2e0169aba53d88f6c30c8b15858315d' into eclair-plus-aosp

* commit '879664e3e2e0169aba53d88f6c30c8b15858315d':
  Adding columns to support attribution of status updates.  Also renaming some columns to better describe their purpose.
2009-09-27 19:55:51 -07:00
Marco Nelissen
aa50713649 am dba93b68: Merge change 27318 into eclair
Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp

* commit 'dba93b68326f139f669aefa6770d50daff032746':
  Check that playlist entries refer to a row in the audio table.
2009-09-27 19:50:49 -07:00
Dmitri Plotnikov
879664e3e2 Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Change-Id: If6d7812f38a3cfd662a5ae2387c72c4761fdf9fa
2009-09-27 19:47:48 -07:00
Android (Google) Code Review
dba93b6832 Merge change 27318 into eclair
* changes:
  Check that playlist entries refer to a row in the audio table.
2009-09-27 22:43:05 -04:00
Wu-cheng Li
216638a035 am e883847f: Merge change 27292 into eclair
Merge commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62' into eclair-plus-aosp

* commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62':
  Add documentation about flash and change video-light to torch.
2009-09-27 19:22:12 -07:00
Android (Google) Code Review
e883847f17 Merge change 27292 into eclair
* changes:
  Add documentation about flash and change video-light to torch.
2009-09-27 22:13:43 -04:00
Mathias Agopian
9da48f2602 am 960972d4: Merge change 27375 into eclair
Merge commit '960972d465d6890d51c73fc08dda7fb17825ce7f' into eclair-plus-aosp

* commit '960972d465d6890d51c73fc08dda7fb17825ce7f':
  Allways dump the list of allocated buffers when an allocation fails.
2009-09-27 18:54:02 -07:00
Android (Google) Code Review
960972d465 Merge change 27375 into eclair
* changes:
  Allways dump the list of allocated buffers when an allocation fails.
2009-09-27 21:47:29 -04:00
Mathias Agopian
c4646e654a Allways dump the list of allocated buffers when an allocation fails.
Hopefully this will help us understand cases of failures such as [2148405]
2009-09-27 18:44:09 -07:00
Jason Sams
7a5917d5db am 41c64ba7: Merge change 27364 into eclair
Merge commit '41c64ba73cf4dbc14beeaaa618afdd908da8b0cb' into eclair-plus-aosp

* commit '41c64ba73cf4dbc14beeaaa618afdd908da8b0cb':
  Improve logging code to dump more detaild rs object info.  Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
2009-09-27 18:10:56 -07:00
Android (Google) Code Review
41c64ba73c Merge change 27364 into eclair
* changes:
  Improve logging code to dump more detaild rs object info.  Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
2009-09-27 21:04:09 -04:00
Doug Zongker
874054f862 am a78fcccd: Merge change 27348 into eclair
Merge commit 'a78fcccde4131d83681eabe17ec32a3900f5289e' into eclair-plus-aosp

* commit 'a78fcccde4131d83681eabe17ec32a3900f5289e':
  fix "pacakge" typo in error log message
2009-09-27 18:02:15 -07:00
Android (Google) Code Review
a78fcccde4 Merge change 27348 into eclair
* changes:
  fix "pacakge" typo in error log message
2009-09-27 20:56:57 -04:00
Jason Sams
3c0dfbab80 Improve logging code to dump more detaild rs object info. Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement. 2009-09-27 17:50:38 -07:00
Wu-cheng Li
068ef42c3f Add documentation about flash and change video-light to torch. 2009-09-27 17:29:44 -07:00
Dianne Hackborn
10146f239c am 02541fe6: Merge change 27351 into eclair
Merge commit '02541fe6a256eef2eab37f3aafc1916a46d65c1a' into eclair-plus-aosp

* commit '02541fe6a256eef2eab37f3aafc1916a46d65c1a':
  Allow wallpaper picker to work.
2009-09-27 17:13:47 -07:00
Android (Google) Code Review
02541fe6a2 Merge change 27351 into eclair
* changes:
  Allow wallpaper picker to work.
2009-09-27 20:06:33 -04:00
Dianne Hackborn
aef405d829 Allow wallpaper picker to work.
Change-Id: I379f25e0e8e372d72c0a89e71ccd584a5dbb3648
2009-09-27 17:05:46 -07:00
Doug Zongker
119376ed49 fix "pacakge" typo in error log message 2009-09-27 17:03:12 -07:00
Christopher Tate
f6c74a4f72 am 4b35d699: Merge change 27342 into eclair
Merge commit '4b35d699e1ebd8f3d25b8300ff9c3923547f14d0' into eclair-plus-aosp

* commit '4b35d699e1ebd8f3d25b8300ff9c3923547f14d0':
  Don't back up / restore "allow apps from unknown sources"
2009-09-27 16:54:54 -07:00
Yu Shan Emily Lau
d155f6d792 am d021ea27: Merge change 27306 into eclair
Merge commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc' into eclair-plus-aosp

* commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc':
  Modified the test case name for the browser page load test.
2009-09-27 16:54:35 -07:00
Christopher Tate
dd205d1446 am 5fbbdf2a: Merge change 27325 into eclair
Merge commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7' into eclair-plus-aosp

* commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7':
  Don't forget to clear "backup in progress" state when finishing a pass
2009-09-27 16:54:22 -07:00
Robert Greenwalt
fcc381b174 am fdda2746: Merge change 27304 into eclair
Merge commit 'fdda2746d83f08452953e154bdc1314544afc2bd' into eclair-plus-aosp

* commit 'fdda2746d83f08452953e154bdc1314544afc2bd':
  Fix Cdma re-start of default connection.
2009-09-27 16:53:48 -07:00
Android (Google) Code Review
4b35d699e1 Merge change 27342 into eclair
* changes:
  Don't back up / restore "allow apps from unknown sources"
2009-09-27 19:38:23 -04:00
Christopher Tate
f582a69dd2 Don't back up / restore "allow apps from unknown sources"
We no longer back up the state of the "Allow the installation of applications
from unknown sources" setting, nor do we set that based on restore data even if
it is present.

Change-Id: Ida276874616f1ff82807d642b0b733fcab339529
2009-09-27 16:36:14 -07:00
Android (Google) Code Review
d021ea27ce Merge change 27306 into eclair
* changes:
  Modified the test case name for the browser page load test.
2009-09-27 19:07:29 -04:00
Android (Google) Code Review
5fbbdf2a21 Merge change 27325 into eclair
* changes:
  Don't forget to clear "backup in progress" state when finishing a pass
2009-09-27 18:58:27 -04:00
Christopher Tate
a253f16cf8 Don't forget to clear "backup in progress" state when finishing a pass
If a backup pass had been skipped (either because the transport was unavailable
or -- in a common case! -- because there was simply no work pending when the
periodic backup check fired), we were forgetting to reset the "backup currently
in progress" flag.  Once we'd done that, the device would *NEVER* perform a
backup until it was rebooted, since it would forever think that there was one
currently in operation that must not be interfered with.

Change-Id: I0d6d7375dc6de99b599222a449934e70fe13ebb9
2009-09-27 15:16:44 -07:00
Android (Google) Code Review
fdda2746d8 Merge change 27304 into eclair
* changes:
  Fix Cdma re-start of default connection.
2009-09-27 18:10:28 -04:00
Grace Kloba
aecb8a007c am e02e8b9c: Merge change 27315 into eclair
Merge commit 'e02e8b9c11231d99aacd5fda31042168650edd49' into eclair-plus-aosp

* commit 'e02e8b9c11231d99aacd5fda31042168650edd49':
  Reset mPreventDrag at touch_down.
2009-09-27 15:09:30 -07:00
Marco Nelissen
d4f3586c93 Check that playlist entries refer to a row in the audio table. 2009-09-27 15:06:03 -07:00
Android (Google) Code Review
e02e8b9c11 Merge change 27315 into eclair
* changes:
  Reset mPreventDrag at touch_down.
2009-09-27 18:04:13 -04:00
Robert Greenwalt
e436d46e57 Fix Cdma re-start of default connection.
We dropped an onTrySetupData call because onEnableNewApn calls that automatically on GSM,
but CDMA was not doing anything.  Made CDMA simply call onTrySetupData.

Also, isApnTypeActive for CDMA was returning true even when no data was working.  Changed
to report true when initing or connected, like GSM.
2009-09-27 14:55:37 -07:00
Wei Huang
98b050d067 am fbb72631: add new column "real_date" for IM messages table.
Merge commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb' into eclair-plus-aosp

* commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb':
  add new column "real_date" for IM messages table.
2009-09-27 14:55:12 -07:00