Commit Graph

5455 Commits

Author SHA1 Message Date
Mike Lockwood
304623e879 am 989b76aa: Merge change Ieca126e6 into eclair
Merge commit '989b76aadd92538c7ab4ca00c34508b42fda8cef' into eclair-mr2

* commit '989b76aadd92538c7ab4ca00c34508b42fda8cef':
  Fix problem with proximity sensor not reawaking screen if the values change too quickly.
2009-11-02 11:48:54 -08:00
Android (Google) Code Review
aa628c911a Merge change Ieca126e6 into eclair
* changes:
  Fix problem with proximity sensor not reawaking screen if the values change too quickly.
2009-11-02 14:42:25 -05:00
Dianne Hackborn
f8b1cf31a9 am b6a6791f: Merge change I60413727 into eclair
Merge commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f' into eclair-mr2

* commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f':
  Fix issue #2226370: Resource versions match with equality
2009-11-02 10:52:22 -08:00
Android (Google) Code Review
e6be7cea30 Merge change I60413727 into eclair
* changes:
  Fix issue #2226370: Resource versions match with equality
2009-11-02 13:43:52 -05:00
Eric Laurent
46d7963a6e am 31f62008: Merge change I29bc113c into eclair
Merge commit '31f62008db4b2c3bfd24379b76570fd9bd1de2b3' into eclair-mr2

* commit '31f62008db4b2c3bfd24379b76570fd9bd1de2b3':
  Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
2009-11-02 10:11:25 -08:00
Mike Lockwood
1e571f4bff am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-mr2

* commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90':
  Do not advance mLastEventTime when enabling or disabling user activity.
2009-11-02 10:11:17 -08:00
Android (Google) Code Review
04afbd2388 Merge change I29bc113c into eclair
* changes:
  Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
2009-11-02 13:05:08 -05:00
Eric Laurent
134aa9c942 Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
Reduce sleep time in AudioFlinger mixer thread when no data has been written to output to speed up startup time when  exiting standby.

The rest of the modifications for this issues is in kernel driver:
 commit 0dbb0ee136ed8de757df1ae26d84556c1751deae for buffer size modification from 8192 to 4800 bytes.
Another kernel improvement that is not submitted yes will reduce delay when audio output is exiting standby.
2009-11-02 00:13:56 -08:00
Dianne Hackborn
c2a04c3f2d Fix issue #2226370: Resource versions match with equality
Also fixed turned-around increment of version number for resources. :(

Change-Id: I604137272da984bcd69cee4f174e6b7f2c786e46
2009-11-01 21:16:59 -08:00
Mike Lockwood
771189763a am 9efd523c: Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '9efd523c4611c0cf10e712453a699c083a01064c' into eclair-mr2

* commit '9efd523c4611c0cf10e712453a699c083a01064c':
  Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
2009-11-01 07:15:27 -08:00
Mike Lockwood
10cfc5ba35 am 4984e73d: Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea' into eclair-mr2

* commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea':
  Manage button and keyboard backlights with light sensor in both manual and automatic mode.
2009-11-01 07:15:20 -08:00
Mike Lockwood
47458276b8 am df024920: Don\'t turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit 'df024920ebc63a82f570105c7a26e339ff244afd' into eclair-mr2

* commit 'df024920ebc63a82f570105c7a26e339ff244afd':
  Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
2009-11-01 05:31:44 -08:00
Mike Lockwood
4ad91a2da2 am aa66ea88: Use separate flags for enabling hardware and software auto-brightness.
Merge commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21' into eclair-mr2

* commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21':
  Use separate flags for enabling hardware and software auto-brightness.
2009-11-01 05:31:36 -08:00
Iliyan Malchev
e0c077d915 am 05cb5610: Merge change I8c0eb9a6 into eclair
Merge commit '05cb5610fdfb7b69cf90a9230853e59b4ae5e219' into eclair-mr2

* commit '05cb5610fdfb7b69cf90a9230853e59b4ae5e219':
  libagl: silence a LOGD
2009-10-30 18:35:51 -07:00
Android (Google) Code Review
db95a9e824 Merge change I8c0eb9a6 into eclair
* changes:
  libagl: silence a LOGD
2009-10-30 21:29:56 -04:00
Iliyan Malchev
d95c322af3 libagl: silence a LOGD
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-10-30 18:29:08 -07:00
Mike LeBeau
839f9c4a33 am d3e4dab9: Merge change I7df84618 into eclair
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2

* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
  Add a privateImeOption to represent that the IME should not show
2009-10-30 18:22:00 -07:00
Android (Google) Code Review
eefdae5122 Merge change I7df84618 into eclair
* changes:
  Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
2009-10-30 21:12:00 -04:00
Jack Wang
73007efe8f am e8228afb: Merge change I92cdc5ed into eclair
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-mr2

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-10-30 17:07:56 -07:00
Mathias Agopian
39e0df0355 am 77bd91f8: Merge change Ie3e80456 into eclair
Merge commit '77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-mr2

* commit '77bd91f8af44867935ea2df22f69fb244b009b94':
  Turns out the SGX driver is correct and the bug was in this test.
2009-10-30 17:07:49 -07:00
Android (Google) Code Review
fa2d144b7b Merge change I92cdc5ed into eclair
* changes:
  PerformanceCollector: Collect & report perf measurements in key/value form
2009-10-30 20:02:13 -04:00
Android (Google) Code Review
964d94306b Merge change Ie3e80456 into eclair
* changes:
  Turns out the SGX driver is correct and the bug was in this test.
2009-10-30 19:40:09 -04:00
Mathias Agopian
6c7d04b1d0 Turns out the SGX driver is correct and the bug was in this test.
make sure the 565 1-texel wide texture is specified with an alignment of 4
which is the OpenGL ES default.
2009-10-30 16:32:52 -07:00
Mathias Agopian
53c0d4aa2e am 9baef73c: Merge change Id8b28e4f into eclair
Merge commit '9baef73c9b2ea17a4eba997c45e944ac6b9af835' into eclair-mr2

* commit '9baef73c9b2ea17a4eba997c45e944ac6b9af835':
  fix [2225964] Android runtime restarted in surfaceflinger/BlurFilter.cpp
2009-10-30 15:02:04 -07:00
Mathias Agopian
144fb0bbdf am d01767f8: Merge change I56779290 into eclair
Merge commit 'd01767f8b7038108f9125cd2122b117db9919824' into eclair-mr2

* commit 'd01767f8b7038108f9125cd2122b117db9919824':
  fix[2222341] Soft reset while going back from camcorder settings
2009-10-30 15:01:57 -07:00
Mathias Agopian
5d0024b39b am f989c114: Merge change If007a2fa into eclair
Merge commit 'f989c1140bbc84480498df38abec0fafff04e6ee' into eclair-mr2

* commit 'f989c1140bbc84480498df38abec0fafff04e6ee':
  return proper error code from eglCreateImageKHR
2009-10-30 15:01:44 -07:00
Android (Google) Code Review
fa4c9b8af8 Merge change Id8b28e4f into eclair
* changes:
  fix [2225964] Android runtime restarted in surfaceflinger/BlurFilter.cpp
2009-10-30 17:54:16 -04:00
Android (Google) Code Review
bd5a0027f4 Merge change I56779290 into eclair
* changes:
  fix[2222341] Soft reset while going back from camcorder settings
2009-10-30 17:54:10 -04:00
Android (Google) Code Review
b4d8fbb1a7 Merge change If007a2fa into eclair
* changes:
  return proper error code from eglCreateImageKHR
2009-10-30 17:54:03 -04:00
Mathias Agopian
863e5fdde8 fix[2222341] Soft reset while going back from camcorder settings
add a way to convert a mapped "pushbuffer" buffer to a gralloc handle
which then can be safely used by surfaceflinger, without including
gralloc_priv.h
2009-10-30 14:48:50 -07:00
Mike Reed
e5084cd50e am 1864d01f: Merge change Iae849da2 into eclair
Merge commit '1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-mr2

* commit '1864d01f2be0e82da7d8844fa91bee8880282041':
  add table maskfilter
2009-10-30 14:13:44 -07:00
Android (Google) Code Review
b4d306fb49 Merge change Iae849da2 into eclair
* changes:
  add table maskfilter
2009-10-30 17:03:18 -04:00
Andy McFadden
b64cc4df1a am 4d0bf120: (-s ours) Merge change I08c19bee into eclair
Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-mr2

* commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe':
  DO NOT MERGE: Another gcc 4.0.3 workaround.
2009-10-30 11:03:55 -07:00
Android (Google) Code Review
b00e33d115 Merge change I08c19bee into eclair
* changes:
  DO NOT MERGE: Another gcc 4.0.3 workaround.
2009-10-30 13:53:32 -04:00
Jaikumar Ganesh
755e2eb3aa am 3cf254d2: Merge change I4b3db907 into eclair
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-mr2

* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
  Revert the channge where channels were not selected randomly.
2009-10-30 10:31:25 -07:00
Andy McFadden
550a11455a DO NOT MERGE: Another gcc 4.0.3 workaround.
Temporarily make a function public that doesn't need to be.  When
host gcc-4.0.3 is gone from the build servers we can undo this.

(Cherry-picked from eclair-mr2.)
2009-10-30 10:24:06 -07:00
Android (Google) Code Review
db5fcfd064 Merge change I4b3db907 into eclair
* changes:
  Revert the channge where channels were not selected randomly.
2009-10-30 13:23:43 -04:00
Mathias Agopian
8889a8183c fix [2225964] Android runtime restarted in surfaceflinger/BlurFilter.cpp
crash was due to an unintialized variable, which caused the wrong bluring
format to be used and caused a memory overrrun.
2009-10-29 20:24:44 -07:00
Jeff Sharkey
a69fdb46b2 am 824838d7: Avoid NPE when callers send null selection args.
Merge commit '824838d74eb0316f6987a1d98d2d9e9fa8d4e15b' into eclair-mr2

* commit '824838d74eb0316f6987a1d98d2d9e9fa8d4e15b':
  Avoid NPE when callers send null selection args.
2009-10-29 19:35:32 -07:00
Gloria Wang
4ed25bc99b am 3a814141: Merge change Iee0486e2 into eclair
Merge commit '3a8141416a0b1d517d4729eba4bcf914c468e20b' into eclair-mr2

* commit '3a8141416a0b1d517d4729eba4bcf914c468e20b':
  Dump media recorder PID in dumpsys media.player, and fix minor bugs.
2009-10-29 19:35:16 -07:00
Mathias Agopian
e1e9073eff am 5dc7a21c: Merge change I4e036287 into eclair
Merge commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a' into eclair-mr2

* commit '5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a':
  update line test to expose some bug on SGX530 ed4
2009-10-29 19:34:15 -07:00
Fred Quintana
638eaee59f am fae288c7: Merge change I9efe265f into eclair
Merge commit 'fae288c7987f96df05e91ed154e934de267098be' into eclair-mr2

* commit 'fae288c7987f96df05e91ed154e934de267098be':
  unhide AccountManagerResponse
2009-10-29 19:33:09 -07:00
Ed Heyl
c7d81238af am 154d61fc: Merge change Id6f158b3 into eclair
Merge commit '154d61fc99964bc5ad13384027f063e77b36f9eb' into eclair-mr2

* commit '154d61fc99964bc5ad13384027f063e77b36f9eb':
  Removed javadoc link to hidden class (temporary fix for build)
2009-10-29 19:32:23 -07:00
San Mehat
526dd4a430 am 957e5867: process: Disable debugging
Merge commit '957e58670baad8c5995f1368e3b5280f0dbd891f' into eclair-mr2

* commit '957e58670baad8c5995f1368e3b5280f0dbd891f':
  process: Disable debugging
2009-10-29 19:32:06 -07:00
Evan Millar
0d209fe2e2 am 3034624f: Merge change I26a2d829 into eclair
Merge commit '3034624f68d373d7c79237425319b5b7fd84317e' into eclair-mr2

* commit '3034624f68d373d7c79237425319b5b7fd84317e':
  Add -P flag to ps in dumpstate
2009-10-29 19:31:24 -07:00
Costin Manolache
4e4602c2fd am 4388b988: Merge change Idc4c7714 into eclair
Merge commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12' into eclair-mr2

* commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12':
  Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
2009-10-29 19:30:43 -07:00
Jason Sams
0609b31216 am ec1f1e3d: Merge change Ieab4c75b into eclair
Merge commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde' into eclair-mr2

* commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde':
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.
2009-10-29 19:30:11 -07:00
Jeff Hamilton
746e838b71 am b5c05516: Merge change I3b7d5cbe into eclair
Merge commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df' into eclair-mr2

* commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df':
  Copy the selection args when creating a CPO since callers often reuse the passed in array.
2009-10-29 19:29:16 -07:00
San Mehat
87655837e0 am 8e312e81: Merge change Ia5109a87 into eclair
Merge commit '8e312e8160ef0cae569b6127591ee72c70bfda41' into eclair-mr2

* commit '8e312e8160ef0cae569b6127591ee72c70bfda41':
  process: Add debug code to log process group transitions
2009-10-29 19:28:58 -07:00
Jack Palevich
90e8e48f3f am b575e4df: Merge change I4a943184 into eclair
Merge commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe' into eclair-mr2

* commit 'b575e4dffe123dc7c8c579dc9cf6130eae6a4abe':
  Avoid trying to throw multiple exceptions at once.
2009-10-29 19:28:38 -07:00