3831 Commits

Author SHA1 Message Date
Alex Sakhartchouk
9ba3ea84d9 am 66ce1fce: Merge "Removing changes not meant for MR1" into ics-mr1
* commit '66ce1fce59d2dc16f1905120e0fe3851ba1add90':
  Removing changes not meant for MR1
2011-10-31 17:31:48 +00:00
Alex Sakhartchouk
66ce1fce59 Merge "Removing changes not meant for MR1" into ics-mr1 2011-10-31 10:30:37 -07:00
Ed Heyl
92537e6ff2 merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)
Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928
2011-10-31 06:06:27 -07:00
Jeff Brown
bce4561708 resolved conflicts for merge of 2d280f75 to ics-mr1
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
2011-10-30 14:24:02 -07:00
Jeff Brown
89101cd9d9 Improve the slow query instrumentation.
On user-debug and eng builds, you can set the
"db.log.slow_query_threshold" system property to queries that
take longer than the specified number of milliseconds.
Set it to 0 to log all queries.

This property has been around for a while but it was implemented
poorly.  In particular, it *changed* the behavior of the query
by calling getCount() while holding the Db connection.
In normal operation, the query will not actually run until later.

By putting the timing logic into fillWindow() instead, we ensure
that we only measure queries that actually ran.  We also capture
cases where the cursor window gets filled multiple times.

Bug: 5520301
Change-Id: I174f5e1ea15831a1d22a36e9a804d7755f230b38
2011-10-28 14:58:39 -07:00
John Grossman
6fd7789abc Make the LocalClock HAL wrapper use a singleton HAL instance.
Change the local clock helper wrapper to hold just a single copy of the local
time HAL instead of having each wrapper hold their own HAL instance.

Change-Id: I978bf70236095251941776be86abb6a27cc4bf5d
2011-10-28 10:14:48 -04:00
Mike J. Chen
a94f7642a8 Add lib/aah_timesrv
aah_timesrv is a library that provides access to the local clock
and the common time service.

This is a squashed merge from master-tungsten of the following changes:

commit a59f6fce4ad7bb664270b70484958210780a9bdd
Author: John Grossman <johngro@google.com>
Date:   Fri Aug 12 11:49:03 2011 -0700

    Adapt to a change in the local time HAL.

    Changed the definition of the slew function in the local time HAL to take an
    int16 instead of an int32 and to use the full range of the int instead of
    attempting to imply any particular PPM range.

    Change-Id: Ie8825a4f7ae36aeeb2b23a1613f84b1672f37a26

commit f7e0cdac72592be1e24f08803e922f7be696d14b
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 17:29:21 2011 -0700

    Remove "primary" from the local_time HAL.

    Interface instances are a pattern which should only be used by audio.  Remove
    its use from the local_time HAL.

    Change-Id: Ib96faaacc7f5b9f10f4bfd67e491316e99dc3c96

commit a148e2674b1d3cb73289b82b85c333f0a66824a9
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 20 17:02:24 2011 -0700

    Move the A@H time service into frameworks/base

    Change-Id: I5c570cde70e8931e205516cb33517585804ce841

Change-Id: I0a840e5803f015659d3d21d5be287f98712c75eb
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-10-28 10:14:48 -04:00
Alex Sakhartchouk
d97fd1d7c3 Removing changes not meant for MR1
Change-Id: I75136be33f12a87c2b5f21b064c06065a4145d70
2011-10-27 13:51:55 -07:00
Jason Sams
27812a8f14 am 28e4f87f: Fix bug where CPU could be stuck spinning Required the wallpaper be animating and the system to have run slowly during the last frame when rendering stopped.
* commit '28e4f87f38cae799b494e160467d732e988bad89':
  Fix bug where CPU could be stuck spinning Required the wallpaper be animating and the system to have run slowly during the last frame when rendering stopped.
2011-10-27 01:25:38 +00:00
Jason Sams
28e4f87f38 Fix bug where CPU could be stuck spinning
Required the wallpaper be animating and
the system to have run slowly during the
last frame when rendering stopped.

bug 5180240

Change-Id: I38c2b6f07a1e36019dd05c77a58973e36d12728c
2011-10-26 17:56:00 -07:00
Romain Guy
79174b7528 Merge "Make sure 9patches are not filtered when not necessary Bug #5383406" 2011-10-20 20:33:51 -07:00
Romain Guy
5e7c469c7a Make sure 9patches are not filtered when not necessary
Bug #5383406

Change-Id: I061c8069a4d9f4eaf45671283710b564639eeb32
2011-10-20 20:33:07 -07:00
Iliyan Malchev
64ef6b47e0 add -ldl to host executables
This fixes the build on Linux when RefBase is compiled with reference tracking
enabled.

Change-Id: I3e931e0b463ce836f6fdb30c37068d77144631a3
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-10-20 16:21:25 -07:00
Jason Sams
79235d2a93 Merge "adding getters to Sampler ProgramRaster, ProgramStore, Element. Element adds ability to get subelement info. Tests for new stuff." 2011-10-20 13:54:37 -07:00
Jason Sams
5b6f23868a Merge "Remove ObjBaseRef from the hal struct" 2011-10-20 13:52:43 -07:00
Jason Sams
981d13291e Merge "Fixes and optimizations of two quaternion functions." 2011-10-20 13:49:59 -07:00
Jesse Hall
d10475e24f Merge "SurfaceTexture: add tests for buffer leaks" 2011-10-20 09:09:31 -07:00
Romain Guy
6ca2b062c5 Merge "Correctly dump DrawPatch operations in display lists" 2011-10-19 17:07:25 -07:00
Romain Guy
a62f172215 Correctly dump DrawPatch operations in display lists
Change-Id: I8cd1c764ddc184ce45727913fa2a23a3d81b337e
2011-10-19 17:06:19 -07:00
Jamie Gennis
59940b42c3 SurfaceTexture: add tests for buffer leaks
This change adds two tests to ensure that eglDestroySurface does not
cause Gralloc buffers to be leaked.

Bug: 5472838
Change-Id: Id675d74e34b6479f2d68314d40de94aede69f142
2011-10-19 15:19:19 -07:00
Jamie Gennis
08bad20ee7 am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
* commit '827d069afb297b6d96c995c03da9d4ee17e60679':
  SurfaceTexture: free buffers when disconnect fails
2011-10-19 11:08:11 -07:00
Jamie Gennis
791e63829c SurfaceTexture: free buffers when disconnect fails
This change makes SurfaceTextureClient free its references to all the
buffers even when the disconnect binder call to the SurfaceTexture
fails.

Bug: 5384823
Change-Id: Iad787fbae5fda4769546fd52276e4e4030c62be6
2011-10-18 17:14:33 -07:00
Alex Sakhartchouk
f13ada94ea Fixes and optimizations of two quaternion functions.
Change-Id: Ie5a3f16d49b716d91b6f68fa389473548cecb80d
2011-10-18 11:54:49 -07:00
Alex Sakhartchouk
7d5f5e7c89 adding getters to Sampler ProgramRaster, ProgramStore, Element.
Element adds ability to get subelement info. Tests for new stuff.

Change-Id: I4a77b91e4e0e73c95ab28b42c50732a64e71e7b9
2011-10-18 11:08:31 -07:00
Alex Sakhartchouk
5ef2f53a00 Remove ObjBaseRef from the hal struct
Change-Id: Idcac14ecfdd4d06a0f54bf50e3b9657be62e6638
2011-10-18 10:54:29 -07:00
Romain Guy
b6233ffd60 Merge "Return early when we cannot allocate a hardware layer Bug #5462308" 2011-10-17 17:11:08 -07:00
Romain Guy
5cd5c3f7e4 Return early when we cannot allocate a hardware layer
Bug #5462308

Change-Id: I52dab809662f6f42a49ca03edc50f6b98fc35a06
2011-10-17 17:10:02 -07:00
Mathias Agopian
72cdc6d488 am 9a0732af: Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0
* commit '9a0732af1bd96a7d8247dee124a7da389137a52f':
  SensorManager reconnects to sensor service when the later dies
2011-10-17 15:52:31 -07:00
Mathias Agopian
9a0732af1b Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0 2011-10-17 15:50:36 -07:00
Jamie Gennis
eb587070b9 am 3a735078: Merge "SurfaceTexture: report binder transaction failures" into ics-mr0
* commit '3a73507801b56da83140fad14a1a3d4eced213d9':
  SurfaceTexture: report binder transaction failures
2011-10-17 11:35:53 -07:00
Mathias Agopian
1c8a6bf3b2 am fefffc68: Merge "add logging and defensive code when initializing sensors" into ics-mr0
* commit 'fefffc685ab703b44f6e32b5ec45292b22d370a3':
  add logging and defensive code when initializing sensors
2011-10-17 11:32:15 -07:00
Jamie Gennis
7f7362c02b Merge changes I4e5ff00c,Id5e3ca1d,I97cbba61
* changes:
  SurfaceFlinger: Remove display freezing code
  SurfaceFlinger: add some layer update tests
  SurfaceFlinger: make sync transactions explicit
2011-10-17 11:31:39 -07:00
Jamie Gennis
3a73507801 Merge "SurfaceTexture: report binder transaction failures" into ics-mr0 2011-10-17 11:25:46 -07:00
Mathias Agopian
de6c44e906 SensorManager reconnects to sensor service when the later dies
if system process ever restarted, processes using a SensorManager
would loose the ability to use it, resulting to a crash.
we now listen for sensor service death and reconnected if necessary.

Bug: 5445240
Change-Id: Ia47f8b26cdcecb729fa22bf11d55e10fcaef8cfc
2011-10-16 22:15:23 -07:00
Alex Sakhartchouk
a744ead977 Merge "Adding getter functions for script side RS objects. Multiproject change involving on device linker" 2011-10-16 12:13:18 -07:00
Mathias Agopian
a338379873 add logging and defensive code when initializing sensors
Bug: 5445240
Change-Id: I9dc7d27d3e8b4f15989488859831526d8c7ded3b
2011-10-16 00:38:30 -07:00
Alex Sakhartchouk
7e6aac1533 Adding getter functions for script side RS objects.
Multiproject change involving on device linker

Change-Id: I321e8caa6ca23b3fe2c96c78cdcfc15e51f88823
2011-10-15 09:33:05 -07:00
Jeff Brown
a39a055304 Merge "Deprecate local-only CursorWindows." 2011-10-14 21:05:58 -07:00
Jamie Gennis
122aa6bae9 SurfaceFlinger: make sync transactions explicit
This change enables a layer or orientation update transaction sent to
SurfaceFlinger to explicitly request a synchronous transaction.

Change-Id: I97cbba610c13679849f66114b216fa6dbf12f2a9
2011-10-14 16:11:51 -07:00
Jamie Gennis
6cb76588d7 SurfaceTexture: report binder transaction failures
This change fixes the ISurfaceTexture error reporting for the case where
the binder transaction fails.

Bug: 5082219
Change-Id: I6517532992e3a76dc9eb5e4a36af43a562391aaa
2011-10-14 15:17:07 -07:00
Jamie Gennis
93c299d0d0 am a1e273ae: Merge "Surface: fix a protected buffer test" into ics-mr0
* commit 'a1e273ae590ee08cf27baca7facfce51e598d995':
  Surface: fix a protected buffer test
2011-10-14 12:58:37 -07:00
Jamie Gennis
a1e273ae59 Merge "Surface: fix a protected buffer test" into ics-mr0 2011-10-14 12:56:28 -07:00
Jason Sams
3fda6ed3c7 am 43b57ec4: Fix error printing if no command string is set.
* commit '43b57ec48ec7652addc11bbc9fef652c2394b7f5':
  Fix error printing if no command string is set.
2011-10-13 16:13:07 -07:00
Jason Sams
43b57ec48e Fix error printing if no command string is set.
Change-Id: I588c0d0a4e1b8f80c967ebfb6aff179a0cac4a36
2011-10-13 16:05:27 -07:00
Jeff Brown
5e5d6d8ba0 Deprecate local-only CursorWindows.
There is no difference and has never really been a difference
between local-only and remotable CursorWindows.  By removing the
distinction officially in the API, we will make it easier to
implement CrossProcessCursor correctly.  CrossProcessCursor
is problematic currently because it's not clear whether a call
to getWindow() will return a local-only window or a remotable window.
As a result, the bulk cursor adaptor has special case handling
for AbstractWindowedCursors vs. ordinary CrossProcessCursors
so that it can set a remotable window before the cursor fills it.
All these problems go away if we just forget about local-only
windows being special in any way.

Change-Id: Ie59f517968e33d0ecb239c3c4f60206495e8f376
2011-10-12 22:19:41 -07:00
Jamie Gennis
74f7dfa803 Surface: fix a protected buffer test
This change renames the ScreenshotsOfProtectedBuffersFail to
ScreenshotsOfProtectedBuffersSucceed and changes the test to verify that
the screenshot succeeds.

Change-Id: I960bb8eed4211578cb4dc446b08392937da064b6
2011-10-12 18:42:33 -07:00
Jason Sams
731934d12c Merge "Fix bug with 1D arrays and threading. Some elements got launched multiple times." 2011-10-12 18:36:58 -07:00
Jason Sams
2802dae197 Fix bug with 1D arrays and threading.
Some elements got launched multiple times.

Change-Id: Icb257019df591a5d9525867c8ef8d18ef7d4cde5
2011-10-12 18:33:01 -07:00
Romain Guy
17d8e4160f Merge "Add missing public native API" 2011-10-12 14:12:22 -07:00
Romain Guy
71e36aa7db Add missing public native API
Change-Id: Ie3bc706b2ac91d686a5b888e8ae841820e9d37c7
2011-10-12 14:11:32 -07:00