9986 Commits

Author SHA1 Message Date
Romain Guy
83276b9998 am 9d790678: Merge change I32ce8591 into eclair
Merge commit '9d790678bb83c829dddb9e4d0d6d6c4db7facc8b' into eclair-mr2

* commit '9d790678bb83c829dddb9e4d0d6d6c4db7facc8b':
  Stop scrolling ListView when tapping a clickable item.
2009-11-06 18:35:40 -08:00
Android (Google) Code Review
9d790678bb Merge change I32ce8591 into eclair
* changes:
  Stop scrolling ListView when tapping a clickable item.
2009-11-06 21:29:56 -05:00
Romain Guy
4b4f40f84e Stop scrolling ListView when tapping a clickable item.
Bug #2210279.

Approved by mcleron.

Change-Id: I32ce8591b00fada95072513f5de69674b45e4cf3
2009-11-06 17:41:43 -08:00
Mathias Agopian
b448893039 am 45dd12cb: Merge change I9f3020db into eclair
Merge commit '45dd12cb0834ea5d72872a6d5b3095f3af152434' into eclair-mr2

* commit '45dd12cb0834ea5d72872a6d5b3095f3af152434':
  fix [2243164] live wallpaper screen artifacts at end of boot
2009-11-06 17:15:45 -08:00
Android (Google) Code Review
45dd12cb08 Merge change I9f3020db into eclair
* changes:
  fix [2243164] live wallpaper screen artifacts at end of boot
2009-11-06 20:08:35 -05:00
Jack Palevich
a3a351e5d1 resolved conflicts for merge of 4e3fadd0 to eclair-mr2 2009-11-06 16:35:19 -08:00
Mathias Agopian
9f3020db15 fix [2243164] live wallpaper screen artifacts at end of boot
make sure to glClear() the areas not touched by the animation
2009-11-06 16:30:18 -08:00
Android (Google) Code Review
4e3fadd0c9 Merge change Ia4424950 into eclair
* changes:
  Fix stupid bug in GLThreadManager implementation.
2009-11-06 19:00:54 -05:00
Android (Google) Code Review
f6ff2be323 Merge change I72749815 into eclair-mr2
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-06 19:00:07 -05:00
Scott Main
3bde388ac2 am 1edbc1a1: am 0e08055a: Merge change I14a9acd3 into eclair-sdk
Merge commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b' into eclair-mr2

* commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b':
  docs: add new document for the win usb driver;
2009-11-06 15:50:03 -08:00
Jack Palevich
a44249500f Fix stupid bug in GLThreadManager implementation.
The code intended to copy the old value of a field, before the
field was updated. However, what the code was actually doing was
copying the new value of the field, after the field was updated.

The fix was to move the copy to before the update.

This is work towards fixing bug 2228262
2009-11-07 07:49:15 +08:00
Scott Main
1edbc1a12c am 0e08055a: Merge change I14a9acd3 into eclair-sdk
Merge commit '0e08055aa31c752732005fc48b09ee470a2c4822' into eclair

* commit '0e08055aa31c752732005fc48b09ee470a2c4822':
  docs: add new document for the win usb driver;
2009-11-06 15:41:28 -08:00
Eric Fischer
7274981597 Import revised translations. DO NOT MERGE 2009-11-06 15:25:20 -08:00
Dave Sparks
461af5c8db am 7ab900ed: Merge change Ic8093c11 into eclair
Merge commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3' into eclair-mr2

* commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3':
  Hold a lock while we access the preview heap.
2009-11-06 14:11:20 -08:00
Evan Millar
087c06039f am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-mr2

* commit '2b3970a2956152a508254aa2675b68df363d46c1':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:04:18 -08:00
Android (Google) Code Review
7ab900edd6 Merge change Ic8093c11 into eclair
* changes:
  Hold a lock while we access the preview heap.
2009-11-06 17:03:52 -05:00
Android (Google) Code Review
0e08055aa3 Merge change I14a9acd3 into eclair-sdk
* changes:
  docs: add new document for the win usb driver; remove usb guide from the device document.
2009-11-06 16:57:12 -05:00
Android (Google) Code Review
2b3970a295 Merge change Idc1396c8 into eclair
* changes:
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 16:56:51 -05:00
Scott Main
ad68fdd702 docs: add new document for the win usb driver;
remove usb guide from the device document.
2009-11-06 13:48:21 -08:00
Michael Chan
811f655366 am 8d51f710: Merge change Icdd2864e into eclair
Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-mr2

* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:33:06 -08:00
Android (Google) Code Review
8d51f7101d Merge change Icdd2864e into eclair
* changes:
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 16:23:42 -05:00
jsh
91abf10520 am b90a187d: Merge change Ie994c0e8 into eclair
Merge commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595' into eclair-mr2

* commit 'b90a187d2cbbedcec87b479c9df7fd45804ad595':
  Update CdmaSmsTest unit test.
2009-11-06 13:23:15 -08:00
Mike Lockwood
dc2a3f60f2 am b8933665: Merge change I3f0ded49 into eclair
Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-mr2

* commit 'b8933665376905c91069eb29fa78c029aa790ce9':
  Increase light sensor delay from one to two seconds.
2009-11-06 13:23:05 -08:00
Christopher Tate
307fbbf2b6 am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-mr2

* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:22:54 -08:00
Android (Google) Code Review
883be83eab Merge change I2effb21e into eclair-mr2
* changes:
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 16:08:38 -05:00
Android (Google) Code Review
b90a187d2c Merge change Ie994c0e8 into eclair
* changes:
  Update CdmaSmsTest unit test.
2009-11-06 15:58:20 -05:00
Android (Google) Code Review
b893366537 Merge change I3f0ded49 into eclair
* changes:
  Increase light sensor delay from one to two seconds.
2009-11-06 15:55:52 -05:00
Mike Lockwood
9b813692f5 Increase light sensor delay from one to two seconds.
Change-Id: I3f0ded49cb447835133cf8d5d693260e8312aa89
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-06 15:53:59 -05:00
Android (Google) Code Review
49fa9e0098 Merge change Ibf6e51b7 into eclair
* changes:
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 15:00:31 -05:00
Evan Millar
dc1396c881 Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
Fixes http://b/issue?id=2178591
2009-11-06 11:59:39 -08:00
jsh
1e1c24bed2 Update CdmaSmsTest unit test.
Forgot to do this with previous check in.  Now that calculateLength() has
been fixed to match the actual encoding (ie, doesn't support single-segment
EMS), test case needs to be updated.

Fixes b/2244483
2009-11-06 11:55:19 -08:00
Evan Millar
c11b225c43 am 7e4a0047: Merge change I97b30e2f into eclair
Merge commit '7e4a004799eae347f1be227ecba6850d1b386bd2' into eclair-mr2

* commit '7e4a004799eae347f1be227ecba6850d1b386bd2':
  Revert jparks code from IPCThreadState.
2009-11-06 11:54:59 -08:00
Android (Google) Code Review
7e4a004799 Merge change I97b30e2f into eclair
* changes:
  Revert jparks code from IPCThreadState.
2009-11-06 14:49:39 -05:00
Dave Sparks
c8093c1128 Hold a lock while we access the preview heap.
copyFrameAndPostCopiedFrame was not holding a lock while it accessed
the preview heap. If the client process is torn down while the heap
is accessed, the memcpy could access memory that was deallocated.

This patch creates a local sp reference to the preview heap while
holding the lock, then releases the lock. This should prevent the
heap from being pulled out from underneath us.
2009-11-06 11:47:13 -08:00
Charles Mendis
6b07bf3d8f am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:46:43 -08:00
Android (Google) Code Review
3cba72880b Merge change I6ccd2ebc into eclair
* changes:
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 14:39:22 -05:00
Charles Mendis
322591cb4b Expose PowerManager.isScreenOn in the public api.
Change-Id: I6ccd2ebcbf3f8ad9ffa4b86a9c037cb0c25a7b78
2009-11-06 14:37:07 -05:00
Christopher Tate
8ee038d926 Set argv[0] from the main thread of an app, not a random binder thread
Change-Id: Ibf6e51b7975cdb5e6aa97591a571c599ecf84020
2009-11-06 11:30:20 -08:00
Cary Clark
ca3a6dc414 am 45011f2d: (-s ours) Merge change I4e9fe62b into eclair
Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-mr2

* commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80':
  do not merge -- original checkin to mr2 here:
2009-11-06 11:29:40 -08:00
Android (Google) Code Review
f28e0c2ac7 Merge change I9a50fdf4 into eclair-mr2
* changes:
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
2009-11-06 14:25:26 -05:00
Evan Millar
97b30e2f62 Revert jparks code from IPCThreadState. 2009-11-06 11:25:23 -08:00
Android (Google) Code Review
45011f2dc5 Merge change I4e9fe62b into eclair
* changes:
  do not merge -- original checkin to mr2 here:
2009-11-06 14:23:14 -05:00
Android (Google) Code Review
300160edc9 Merge change I29a3be5b into eclair-mr2
* changes:
  Calendar: add CALLER_IS_SYNCADAPTER parameter.
2009-11-06 13:23:27 -05:00
Xavier Ducrohet
bef1749148 am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants.
Merge commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed' into eclair-mr2

* commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed':
  New API 4 with new CDMA constants.
2009-11-06 10:08:03 -08:00
Andreas Huber
be364022fb am fde273ba: Merge change Ic997acac into eclair
Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-mr2

* commit 'fde273baf6592a5fde15ee4dd4d798d90368e440':
  Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
2009-11-06 10:07:53 -08:00
Xavier Ducrohet
9eaff61adf am 91bb62f0: New API 4 with new CDMA constants.
Merge commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9' into eclair

* commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9':
  New API 4 with new CDMA constants.
2009-11-06 10:00:29 -08:00
Andreas Huber
9a50fdf467 Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting. 2009-11-06 08:44:26 -08:00
Android (Google) Code Review
fde273baf6 Merge change Ic997acac into eclair
* changes:
  Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
2009-11-06 11:27:03 -05:00
Cary Clark
4e9fe62b37 do not merge -- original checkin to mr2 here:
https://android-git.corp.google.com/g/#change,30204

check for native initialization before calling public function

Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.

These cases can be triggered by the monkey.

Fixes http://b/issue?id=2187719
2009-11-06 10:29:30 -05:00
Jared Suttles
1ae7831b8a am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting
Merge commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f' into eclair-mr2

* commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f':
  jni: GpsLocationProvider: Check for pending callbacks before waiting
2009-11-06 06:31:37 -08:00