Commit Graph

3965 Commits

Author SHA1 Message Date
Mike LeBeau
0a257d15d3 am af0b780a: Merge change 23198 into donut
Merge commit 'af0b780ac6305eb6b6795cb8139ae051e13dd7ff' into eclair

* commit 'af0b780ac6305eb6b6795cb8139ae051e13dd7ff':
  Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:15:58 -07:00
Android (Google) Code Review
8efb42692d Merge change 23198 into donut
* changes:
  Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:14:21 -07:00
Android (Google) Code Review
047784f437 Merge change 23182 into eclair
* changes:
  MO SMS fail after sending 100 messages
2009-08-28 14:04:38 -07:00
Brett Chabot
ad962cd01c am e1df8224: Merge change 23173 into donut
Merge commit 'e1df82248a68282a4d556ce61db09949fc186827' into eclair

* commit 'e1df82248a68282a4d556ce61db09949fc186827':
  Remove flaky test LifecycleTest.testDialog from large continuous suite.
2009-08-28 13:50:16 -07:00
Android (Google) Code Review
f10650b07e Merge change 23173 into donut
* changes:
  Remove flaky test LifecycleTest.testDialog from large continuous suite.
2009-08-28 13:48:09 -07:00
Android (Google) Code Review
b7621935e2 Merge change 23169 into eclair
* changes:
  More assert => CHECK
2009-08-28 13:35:25 -07:00
Android (Google) Code Review
6b47ad3d2a Merge change 23127 into eclair
* changes:
  Fixing bug 2086021. AccessiblityService could sometimes get a null pointer exception if multiple accessibility services are running and there are several events all happening within a short period of time.
2009-08-28 13:34:38 -07:00
Android (Google) Code Review
2a0ad3081b Merge change 23168 into eclair
* changes:
  EventHub: Fix file descriptor leak.
2009-08-28 13:31:28 -07:00
Android (Google) Code Review
f0baeefc75 Merge change 23165 into eclair
* changes:
  Fixes a race condition between entering ERROR state and initial buffer submit.
2009-08-28 13:30:51 -07:00
Android (Google) Code Review
98b64ad966 Merge change 22940 into eclair
* changes:
  Fix bug 2040024 phone rings only once sometimes.
2009-08-28 13:30:18 -07:00
Mike Lockwood
07549f984d EventHub: Fix file descriptor leak.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-28 13:30:03 -07:00
Android (Google) Code Review
f524696f3f Merge change 23064 into eclair
* changes:
  Implement async data/subData.  Implement TriangleMeshBuilder in SimpleMesh which replaces TriangleMesh.  Update Film to use new builder.
2009-08-28 12:44:40 -07:00
Android (Google) Code Review
63b6eca355 Merge change 23023 into eclair
* changes:
  Armor string format tokens with translation placeholders.
2009-08-28 10:48:29 -07:00
Android (Google) Code Review
de19936ecd Merge change 23108 into eclair
* changes:
  Launch synthesis thread at max priority to prevent hicups in playback. Return and log an error when an operation cannot be completed because the speech queue is locked longer than the timeout period. Log cleanup.
2009-08-28 10:43:54 -07:00
Android (Google) Code Review
1bb5fe19ed Merge change 22988 into eclair
* changes:
  Only add model in the UA for the release build
2009-08-28 09:12:28 -07:00
Android (Google) Code Review
1391eb0c95 Merge change 23103 into eclair
* changes:
  Fixing the build.
2009-08-28 08:42:33 -07:00
Android (Google) Code Review
ee794ba537 Merge change 23077 into eclair
* changes:
  optimize MCC table
2009-08-28 00:45:56 -07:00
Mike LeBeau
4e97ab5ca2 resolved conflicts for merge of 1e348378 to eclair 2009-08-27 23:54:12 -07:00
Android (Google) Code Review
89795d8fa6 Merge change 23067 into eclair
* changes:
  allow delaying after yielding
2009-08-27 21:49:05 -07:00
Android (Google) Code Review
a21ae21b90 Merge change 22893 into eclair
* changes:
  Simplifies err code propagation.
2009-08-27 20:17:12 -07:00
Hung-ying Tyan
be8b0fc7c1 Simplifies err code propagation.
* Other changes
  + Re-assign err codes in VpnManager.
  + Add new err codes: REMOTE_PPP_HUNG_UP, PPP_NEGOTIATION_FAILED.
  + Delete the state file only if it exists (to prevent logging an
    unable-to-unlink error).
  + Extend timeout to 40 seconds.
2009-08-28 09:59:39 +08:00
Android (Google) Code Review
681614fecd Merge change 23043 into donut
* changes:
  Revert "Remove third party support for Quick Search Box (aka global search)."
2009-08-27 18:32:27 -07:00
Android (Google) Code Review
21828ad4ab Merge change 23012 into eclair
* changes:
  Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
2009-08-27 16:58:21 -07:00
Android (Google) Code Review
385f87c1ff Merge change 22991 into eclair
* changes:
  Apparently setting the preferred role of the OMX component is now required on this platform.
2009-08-27 16:34:15 -07:00
Android (Google) Code Review
b4ed20af01 Merge change 22529 into eclair
* changes:
  Track apn Enable synchronously and notice failures
2009-08-27 16:18:50 -07:00
Android (Google) Code Review
a34cffacb4 Merge change 22984 into eclair
* changes:
  fix AbstractThreadedSyncAdapter to actually cancel syncs
2009-08-27 16:18:14 -07:00
Android (Google) Code Review
96300f3b76 Merge change 22962 into eclair
* changes:
  Fix strings whose apostrophes were eaten because of the lack of a backslash.
2009-08-27 16:01:59 -07:00
Android (Google) Code Review
7253194d34 Merge change 22986 into eclair
* changes:
  Squashed commit of the following:
2009-08-27 15:24:35 -07:00
Android (Google) Code Review
0ea2635b09 Merge change 22975 into eclair
* changes:
  Fix issue #2069662: The wallpaper doesn't move along with the home screen
2009-08-27 15:10:27 -07:00
Android (Google) Code Review
484690abcf Merge change 22968 into eclair
* changes:
  Fix a typo.
2009-08-27 14:54:13 -07:00
Dianne Hackborn
8611d45711 am f734e027: Merge change 22939 into donut
Merge commit 'f734e027bfed6c884e5f060c3291d3aeb5706dc8' into eclair

* commit 'f734e027bfed6c884e5f060c3291d3aeb5706dc8':
  Final Donut API list.
2009-08-27 14:40:51 -07:00
Android (Google) Code Review
78fdbb2974 Merge change 22958 into eclair
* changes:
  Don't activate keyguard if screen is turned off while proximity sensor is active.
2009-08-27 14:31:06 -07:00
Android (Google) Code Review
8cdbad8edd Merge change 22673 into eclair
* changes:
  Make SINGLE_TOP work with CLEAR_TOP.
2009-08-27 13:10:54 -07:00
Android (Google) Code Review
8d4bf22dfd Merge change 22938 into eclair
* changes:
  Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
2009-08-27 13:04:56 -07:00
Android (Google) Code Review
da49d54203 Merge change 22722 into eclair
* changes:
  Integrate CDMA provisioning into SetupWizard
2009-08-27 13:01:54 -07:00
Android (Google) Code Review
6286808e4d Merge change 22939 into donut
* changes:
  Final Donut API list.
2009-08-27 12:57:09 -07:00
Android (Google) Code Review
edb04560d6 Merge change 22950 into eclair
* changes:
  Change these string constants back to match donut.
2009-08-27 12:56:40 -07:00
Android (Google) Code Review
13ec63c545 Merge change 22945 into eclair
* changes:
  Add a null check in PackageParser
2009-08-27 12:37:47 -07:00
Android (Google) Code Review
3f9f95b544 Merge change 22944 into eclair
* changes:
  resolved conflicts for merge of 301b97ac to eclair
2009-08-27 12:27:51 -07:00
Dianne Hackborn
a5522f4804 resolved conflicts for merge of 301b97ac to eclair
Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48
2009-08-27 12:26:44 -07:00
Android (Google) Code Review
9bebdff816 Merge change 22897 into eclair
* changes:
  Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
2009-08-27 11:37:35 -07:00
Android (Google) Code Review
9fe8b25461 Merge change 22919 into eclair
* changes:
  Removing "summary"-style URIs.
2009-08-27 11:36:36 -07:00
Android (Google) Code Review
5feecadf47 Merge change 22692 into eclair
* changes:
  PowerManagerService: Disallow all user activity when in proximity wake lock.
2009-08-27 11:26:44 -07:00
Android (Google) Code Review
7fd05d35c7 Merge change 22921 into eclair
* changes:
  An attempt to fix a deadlock between OMXCodec::start and upstream ::read
2009-08-27 11:18:36 -07:00
Android (Google) Code Review
0fb7b61024 Merge change 22870 into eclair
* changes:
  Set Routing to A2DP only when state is Connected.
2009-08-27 11:08:55 -07:00
Android (Google) Code Review
5276762c21 Merge change 22795 into eclair
* changes:
  The Gservices settings for pruning messages/chats.
2009-08-27 10:58:25 -07:00
Android (Google) Code Review
de51d11763 Merge change 22920 into eclair
* changes:
  Change fade to use a gradient from opaque color to transparent color.
2009-08-27 10:43:18 -07:00
Android (Google) Code Review
2085f96b56 Merge change 22830 into eclair
* changes:
  Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
2009-08-27 10:10:07 -07:00
Mike Lockwood
947b55680f am 7566c1de: LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '7566c1debebe072af76411e11d96810fd1409482' into eclair

* commit '7566c1debebe072af76411e11d96810fd1409482':
  LocationManager: Fix problem replacing GPS and network providers with a mock provider.
2009-08-27 09:25:36 -07:00
Android (Google) Code Review
5502899878 Merge change 22453 into eclair
* changes:
  Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
2009-08-27 07:43:36 -07:00