Commit Graph

5830 Commits

Author SHA1 Message Date
Dmitri Plotnikov
23c06eb0d5 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
0d0952445b 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
56fa27572a 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
cfc26be70b 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
0458b1b879 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
Android (Google) Code Review
0ad7990247 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
5118b3b77f 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
e5a6fcc80e 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
55a20b691a 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
ff5054c81e 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
737e786acf 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
136d6329ed 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
72cffcb701 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
7d593afbb6 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
de472a870f Merge change 27348 into eclair
* changes:
  fix "pacakge" typo in error log message
2009-09-27 20:56:57 -04:00
Dianne Hackborn
53b9fa34d3 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
04a7462c46 Merge change 27351 into eclair
* changes:
  Allow wallpaper picker to work.
2009-09-27 20:06:33 -04:00
Doug Zongker
a4f58892d4 fix "pacakge" typo in error log message 2009-09-27 17:03:12 -07:00
Christopher Tate
e84150e495 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
eea0859f2d 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
a871495420 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
af610cc7ef 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
4ec5bfcc8a Merge change 27342 into eclair
* changes:
  Don't back up / restore "allow apps from unknown sources"
2009-09-27 19:38:23 -04:00
Android (Google) Code Review
c8d537bb37 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
9ee9ac8c4c 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
Android (Google) Code Review
1c75da8aae Merge change 27304 into eclair
* changes:
  Fix Cdma re-start of default connection.
2009-09-27 18:10:28 -04:00
Grace Kloba
fc9b69a690 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
Android (Google) Code Review
1b81805ebb Merge change 27315 into eclair
* changes:
  Reset mPreventDrag at touch_down.
2009-09-27 18:04:13 -04:00
Wei Huang
6a481a0ceb 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
Wei Huang
4c5544e2d3 am 6a07f9fb: Merge change 27301 into eclair
Merge commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3' into eclair-plus-aosp

* commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3':
  bug 2148061: if PduBody is zero length, treat it as an empty message.
2009-09-27 14:12:56 -07:00
Android (Google) Code Review
42937f2dec Merge change 27301 into eclair
* changes:
  bug 2148061: if PduBody is zero length, treat it as an empty message.
2009-09-27 17:04:44 -04:00
Dianne Hackborn
2262c2c2fa am ac939d08: Merge change 27291 into eclair
Merge commit 'ac939d086c42afeaef0982cee0e5861184dd82eb' into eclair-plus-aosp

* commit 'ac939d086c42afeaef0982cee0e5861184dd82eb':
  Fix issue #2148939: Sholes slow to wake up in landscape mode
2009-09-27 14:03:37 -07:00
Ray Chen
ef17e39ccd am cc96652c: Remove fflush when storing thumbanil to sdcard.
Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp

* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
  Remove fflush when storing thumbanil to sdcard.
2009-09-27 14:03:32 -07:00
Android (Google) Code Review
3839172532 Merge change 27291 into eclair
* changes:
  Fix issue #2148939: Sholes slow to wake up in landscape mode
2009-09-27 17:00:20 -04:00
Mike Lockwood
1c6dec82d9 am e7d60bfd: Merge change 27032 into eclair
Merge commit 'e7d60bfdff35ad8eace600d2a6cb81163c966bb0' into eclair-plus-aosp

* commit 'e7d60bfdff35ad8eace600d2a6cb81163c966bb0':
  BatteryService: Specify low battery levels in resources.
2009-09-27 12:47:37 -07:00
Nick Pelly
fa1fea64ff am 94bbfa47: Merge change 27142 into eclair
Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp

* commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d':
  Handle expiration of discovery mode in system server.
2009-09-27 12:47:32 -07:00
Nick Pelly
9d8212f840 am 65dea14c: Merge change 27129 into eclair
Merge commit '65dea14cafb357411c6f9307c6d9add60822aa33' into eclair-plus-aosp

* commit '65dea14cafb357411c6f9307c6d9add60822aa33':
  Bounds check read and write path in native code.
2009-09-27 12:47:27 -07:00
Android (Google) Code Review
7d92f50d39 Merge change 27032 into eclair
* changes:
  BatteryService: Specify low battery levels in resources.
2009-09-27 15:43:17 -04:00
Android (Google) Code Review
c65b1a8f3e Merge change 27142 into eclair
* changes:
  Handle expiration of discovery mode in system server.
2009-09-27 15:42:14 -04:00
Android (Google) Code Review
8def6f8e7d Merge change 27129 into eclair
* changes:
  Bounds check read and write path in native code.
2009-09-27 15:41:51 -04:00
Grace Kloba
c69a6a4358 am e03848eb: Merge change 27154 into eclair
Merge commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2' into eclair-plus-aosp

* commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2':
  When change from narrow screen to wide screen, we will
2009-09-27 12:32:47 -07:00
Android (Google) Code Review
7b3a540a31 Merge change 27154 into eclair
* changes:
  When change from narrow screen to wide screen, we will leave the mMinZoomScale to 1.0
2009-09-27 15:24:48 -04:00
Marco Nelissen
f99e52076a am 0faa5c6c: Merge change 27271 into eclair
Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp

* commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2':
  Only scan windows media files when those codecs are enabled.
2009-09-27 12:24:17 -07:00
Android (Google) Code Review
1c07ba141d Merge change 27271 into eclair
* changes:
  Only scan windows media files when those codecs are enabled.
2009-09-27 15:19:27 -04:00
Mike Cleron
2a4d181d3b am 954e98e0: Merge change 27267 into eclair
Merge commit '954e98e023568b354aeec0a54668155ad9083398' into eclair-plus-aosp

* commit '954e98e023568b354aeec0a54668155ad9083398':
  Add official assets for tabs in compatibility mode
2009-09-27 11:12:55 -07:00
Android (Google) Code Review
a83302cb61 Merge change 27267 into eclair
* changes:
  Add official assets for tabs in compatibility mode
2009-09-27 14:05:05 -04:00
Christopher Tate
7574d680be am 141e4f1d: Merge change 27177 into eclair
Merge commit '141e4f1d69186104c3e169ee7365b62bc425859a' into eclair-plus-aosp

* commit '141e4f1d69186104c3e169ee7365b62bc425859a':
  Add auto-brightness mode to the list of backed-up settings
2009-09-27 10:26:39 -07:00
Android (Google) Code Review
8314dfdfec Merge change 27177 into eclair
* changes:
  Add auto-brightness mode to the list of backed-up settings
2009-09-27 13:20:44 -04:00
Dmitri Plotnikov
400ce4fcfa am 8e55eacc: Changing contact status to Presence-based
Merge commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31' into eclair-plus-aosp

* commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31':
  Changing contact status to Presence-based
2009-09-27 08:34:10 -07:00
Mike Cleron
f887e09037 am db9c3f2e: Merge change 27188 into eclair
Merge commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735' into eclair-plus-aosp

* commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735':
  Fix 2146581: Make tabs work for donut apps
2009-09-27 00:36:15 -07:00