Commit Graph

10617 Commits

Author SHA1 Message Date
Jack Palevich
9c0b39c47e am ca00dee2: Merge change I5aa3adcf into eclair
Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-mr2

* commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5':
  Improve the exception message text by including eglGetError().
2009-11-25 13:48:54 -08:00
Android (Google) Code Review
ca00dee214 Merge change I5aa3adcf into eclair
* changes:
  Improve the exception message text by including eglGetError().
2009-11-25 13:43:07 -08:00
Android (Google) Code Review
c61b0de83b Merge change Id6ccc9bc into eclair-mr2
* changes:
  Update documentation: The width of the image for face detection must be even.
2009-11-25 13:41:34 -08:00
Android (Google) Code Review
ed8d33b797 Merge change I5ec249ab into eclair-mr2
* changes:
  More elimination of Formatter (I was tired of waiting several seconds for "dumpsys dropbox"...).
2009-11-25 13:40:10 -08:00
Dan Egnor
5ec249abe3 More elimination of Formatter (I was tired of waiting several
seconds for "dumpsys dropbox"...).
2009-11-25 13:16:47 -08:00
Dianne Hackborn
d1689ea8b7 am 8e1985d4: Merge change Ie552036f into eclair
Merge commit '8e1985d4f28bfa9bea7db05f324759991d4e59e9' into eclair-mr2

* commit '8e1985d4f28bfa9bea7db05f324759991d4e59e9':
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
2009-11-25 13:03:42 -08:00
Brett Chabot
8f4fbc5c9f am d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-mr2

* commit 'd782b4b6f3411ece7299f414783baa3758756bbe':
  Add keyguard permission to instrumented ImfTest package.
2009-11-25 13:02:55 -08:00
Android (Google) Code Review
99cee0318b Merge change Ieb7a7d57 into eclair-mr2
* changes:
  Change the DropBoxManager API slightly (this is public, but not yet released) -- take a File instead of a ParcelFileDescriptor (gets opened internally) -- that way the caller doesn't have to worry about closing their PFD and so on. (Pretty much 100% of the time the caller will be uploading a file, anyway.)
2009-11-25 12:59:48 -08:00
Android (Google) Code Review
8e1985d4f2 Merge change Ie552036f into eclair
* changes:
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
2009-11-25 12:55:44 -08:00
Dianne Hackborn
935ef2c4f4 Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
Change-Id: Ie552036f4ea673e0ce9981ff1cbd1fbe08678510
2009-11-25 12:41:15 -08:00
Dan Egnor
eb7a7d57ca Change the DropBoxManager API slightly (this is public, but not yet released) --
take a File instead of a ParcelFileDescriptor (gets opened internally) --
that way the caller doesn't have to worry about closing their PFD and so on.
(Pretty much 100% of the time the caller will be uploading a file, anyway.)
2009-11-25 12:38:00 -08:00
Android (Google) Code Review
f3e291a05d Merge change Id7b9903e into eclair-mr2
* changes:
  Add setAttentionLight() to IPowerManager for the Phone app.
2009-11-25 12:34:28 -08:00
Mike Lockwood
b11832de73 Add setAttentionLight() to IPowerManager for the Phone app.
Change-Id: Id7b9903e1efaf56a2336519a8653962b6ae2c13d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-25 15:25:55 -05:00
Android (Google) Code Review
a85a0ac107 Merge change I4413e8bc into eclair-mr2
* changes:
  close file descriptors passed to drop box
2009-11-25 11:54:17 -08:00
Android (Google) Code Review
30348b0de1 Merge change I086d681f into eclair-mr2
* changes:
  Remove HardwareService and move vibrator support to VibratorService.
2009-11-25 11:49:32 -08:00
Brett Chabot
d782b4b6f3 Add keyguard permission to instrumented ImfTest package.
Workaround to fix bug 2284623

Change-Id: I80afc37ed5ffae0447e0aedba686c13d682c8076
2009-11-25 11:45:51 -08:00
Android (Google) Code Review
1565d2efc1 Merge change I4ad9ec48 into eclair-mr2
* changes:
  Fix A2dpAudioInterface getParameters.
2009-11-25 11:01:17 -08:00
Mike Lockwood
3a32213c40 Remove HardwareService and move vibrator support to VibratorService.
The lights support is only needed by PowerManagerService and NotificationManagerService, so we do not need a Binder API for it.
Move backlight and notification light support to new LightsService class.
The camera flash is now handled directly by the camera HAL, so the flash Hardware service flash support is obsolete.

Change-Id: I086d681f54668e7f7de3e8b90df3de19d59833c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-25 12:54:58 -05:00
Android (Google) Code Review
5f69f7260f Merge change I3f4f5f05 into eclair-mr2
* changes:
  cdma tones: Fix Call Waiting Tone in the hash map
2009-11-25 09:39:29 -08:00
Naveen Kalla
deb5a9b997 cdma tones: Fix Call Waiting Tone in the hash map
Change-Id: I3f4f5f050c50f328f95a1660dc61cce37059bddd
2009-11-25 09:31:53 -08:00
Doug Zongker
4413e8bc4c close file descriptors passed to drop box
The ParcelFileDescriptors passed to DropBoxManager.addFile() are
supposed to be closed after the call.
2009-11-25 09:16:48 -08:00
Leon Scroggins
f90b1261a5 When clicking on a WebTextView, always call nativeMotionUp.
We were previously calling nativeTextInputMotionUp, which was
intended to be faster than nativeMotionUp, which does more work.
However, as discussed in http://b/issue?id=2257787 , I think we
should simply call nativeMotionUp, which does everything the old
method did, while also correcting things if necessary.  This fixes
the second problem listed in http://b/issue?id=2266756 , since
nativeMotionUp will recognize that the <select> element should
take the click.

Since I have removed a native method, this requires a change to
external/webkit.
2009-11-25 10:14:50 -05:00
Eric Laurent
4ad9ec488c Fix A2dpAudioInterface getParameters.
A2dpAudioInterface::getParameters() was prepending a ';' to the key value pair returned from underlying AudioHardwareInterface.
2009-11-25 06:08:44 -08:00
Ben Murdoch
a2d259aa4a am 7f7c16de: (-s ours) Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
Merge commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-mr2

* commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47':
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
  Improves documentation for GeolocationPermissions class. Do not merge.
2009-11-25 02:43:51 -08:00
Android (Google) Code Review
7f7c16dee2 Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
* changes:
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
  Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
  Improves documentation for GeolocationPermissions class. Do not merge.
2009-11-25 02:37:27 -08:00
Jack Palevich
5aa3adcf30 Improve the exception message text by including eglGetError().
Should help us track down the cause of bug 2285187
2009-11-25 13:56:21 +08:00
Android (Google) Code Review
ee6c7e491b Merge change I2c5380a6 into eclair-mr2
* changes:
  Fix a bug in the Settings contract class (introduced in an ... iffy ... fix to a race condition) that breaks the caching of non-existent Settings/Secure/ Gservices values (causing lots of unnecessary database queries).
2009-11-24 17:25:37 -08:00
Dan Egnor
799f721fcb Fix a bug in the Settings contract class (introduced in an ... iffy ... fix
to a race condition) that breaks the caching of non-existent Settings/Secure/
Gservices values (causing lots of unnecessary database queries).

Fix a dumb thinko (reversed condition) in the SQLiteDatabase logging.
2009-11-24 16:57:44 -08:00
Gloria Wang
d6ccc9bcf0 Update documentation: The width of the image for face detection must be even. 2009-11-24 16:07:19 -08:00
Joe Onorato
df7edf5d92 am 55896f3c: Merge change Ib71193bf into eclair
Merge commit '55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-mr2

* commit '55896f3c5121e73e3f657ed14e7ee8937ad72449':
  Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
2009-11-24 15:46:24 -08:00
Android (Google) Code Review
55896f3c51 Merge change Ib71193bf into eclair
* changes:
  Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
2009-11-24 15:41:32 -08:00
Joe Onorato
b71193bffc Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
In this case, as opposed to what was happening in 1977685, the focused view wasn't the one that was
directly removed, it was a child of the removed view.
2009-11-24 18:34:42 -05:00
Android (Google) Code Review
8e2eb583e7 Merge change I22cf0509 into eclair-mr2
* changes:
  Add China data to MccTable.
2009-11-24 15:19:28 -08:00
Dianne Hackborn
9ad091ab10 am 118d92f7: Merge change I16925b91 into eclair
Merge commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b' into eclair-mr2

* commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b':
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 15:01:51 -08:00
Android (Google) Code Review
118d92f73f Merge change I16925b91 into eclair
* changes:
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 14:43:53 -08:00
Mathias Agopian
1e22cffa1d am 63851404: Merge change Ibf0c320a into eclair
Merge commit '638514048141bf9f28a4bede77b83c3238f5c194' into eclair-mr2

* commit '638514048141bf9f28a4bede77b83c3238f5c194':
  When using MDP, we needed to use a texture for diming.
2009-11-24 14:43:39 -08:00
Android (Google) Code Review
b29fefe6ae Merge change Ic4cf6caa into eclair-mr2
* changes:
  Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg. (In preparation for not copying to /data/dontpanic/last_kmsg at all.)
2009-11-24 14:29:46 -08:00
Android (Google) Code Review
6385140481 Merge change Ibf0c320a into eclair
* changes:
  When using MDP, we needed to use a texture for diming.
2009-11-24 14:26:28 -08:00
Robert Greenwalt
22cf0509b2 Add China data to MccTable.
We didn't have the wifi channel count data there, so we failed to
attempt connections on channel 13.

bug: 2282285
2009-11-24 14:13:04 -08:00
Jim Miller
a442e79126 am 35cdb484: Merge change I6c6c166b into eclair
Merge commit '35cdb484928b34fd517e49e200aa79aa64b4eeb4' into eclair-mr2

* commit '35cdb484928b34fd517e49e200aa79aa64b4eeb4':
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:04:44 -08:00
Android (Google) Code Review
35cdb48492 Merge change I6c6c166b into eclair
* changes:
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:00:54 -08:00
Swarna Kumar
20342ca830 am 7f8e3409: Merge change I816428ae into eclair
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2

* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
2009-11-24 13:33:13 -08:00
Android (Google) Code Review
7f8e34091e Merge change I816428ae into eclair
* changes:
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness. Bug number : 2177113
2009-11-24 13:28:45 -08:00
Swarna Kumar
9abc55ec4a Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Bug number : 2177113
2009-11-24 12:51:01 -08:00
Jason Sams
66358e24a6 am 9dab667e: Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '9dab667e03632181e487a04a8a170b3fa0bd5037' into eclair-mr2

* commit '9dab667e03632181e487a04a8a170b3fa0bd5037':
  Force a crash under conditions where white square bug in all apps is likely to occur.
2009-11-24 12:49:36 -08:00
Jason Sams
9dab667e03 Force a crash under conditions where white square bug in all apps is likely to occur. 2009-11-24 12:26:35 -08:00
Dianne Hackborn
195f6a0ff3 Finish fixing issue #2228381: android.view.InflateException...
...Binary XML file line #37: Error inflating class <unknown> after adding a secondary account

The problem was that we weren't dealing well with the situation where we start a transition
from activity A to B, then transition back to A before B is shown (it finishes before being
shown), then transition from A to C.  At this point we had some state showing that we
were in the process of showing A from it being hidden (due to the middle transition from
B to A), which would cause the layout pass to ensure its window is hidden before the
transition starts.

The solution is to detect the case where we are showing a token and it is already actually
shown, and in this case not do all of the token setup for it to wait for its windows to
be displayed before it is shown.  This isn't needed, the windows are already displayed
or the token is already set up to wait for them to be displayed.

Change-Id: I16925b91e1e2449dd65ade162a5758173c6e2695
2009-11-24 11:34:55 -08:00
Fred Quintana
2464acc6da moved the gdata library to vendor/google 2009-11-24 10:42:00 -08:00
Trevor Johns
82d4b5ccaf am 99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-mr2

* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:40:19 -08:00
Android (Google) Code Review
99f7b56fbe Merge change Iefdb6f97 into eclair
* changes:
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:35:35 -08:00