Dan Stoza
9f3053de78
BufferQueue: Allow detaching/reattaching buffers
...
Adds detachBuffer and attachBuffer calls to both the producer and
consumer sides of BufferQueue. Buffers may be detached while dequeued
by the producer or acquired by the consumer, and when attached, enter
the dequeued and acquired states, respectively.
Bug: 13173343
Change-Id: Ic152692b0a94d99e0135b9bfa62747dab2a54220
2014-03-10 16:45:38 -07:00
Dave Allison
544b09523b
am 13c6fb10
: am 1649c77e
: Merge "ART profiler"
...
* commit '13c6fb1026531635f409f111d78d561592d2ede9':
ART profiler
2014-03-08 07:28:20 +00:00
Greg Hackmann
55886cb128
am 7429e4f7
: am 112aa42e
: Merge "SurfaceFlinger: fix 64-bit format string warnings"
...
* commit '7429e4f7d43cd42563ce77a3a4a861a392bc750f':
SurfaceFlinger: fix 64-bit format string warnings
2014-03-08 07:28:19 +00:00
Jeff Brown
59326cbb5c
am d711ef1d
: am 37bf0789
: Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
...
* commit 'd711ef1d78581a598e23be9730246cfa8ca75bb2':
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-08 05:44:49 +00:00
Dave Allison
13c6fb1026
am 1649c77e
: Merge "ART profiler"
...
* commit '1649c77ed29eada5de32ace97033b9d898e9a6eb':
ART profiler
2014-03-08 01:56:32 +00:00
Greg Hackmann
7429e4f7d4
am 112aa42e
: Merge "SurfaceFlinger: fix 64-bit format string warnings"
...
* commit '112aa42e91b4bb0cde334753e2ad05e3f248b377':
SurfaceFlinger: fix 64-bit format string warnings
2014-03-08 01:56:32 +00:00
Jeff Brown
d711ef1d78
am 37bf0789
: Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
...
* commit '37bf0789f5c1167f6f7f5667b09cad70e0bb27d4':
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-07 23:43:18 +00:00
Dave Allison
1649c77ed2
Merge "ART profiler"
2014-03-07 22:25:35 +00:00
Jeff Brown
37bf0789f5
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
...
Bug: 12938999
Change-Id: I544661b3887332998d703b7b2df9e56c23ab48c4
2014-03-07 13:57:59 -08:00
Greg Hackmann
112aa42e91
Merge "SurfaceFlinger: fix 64-bit format string warnings"
2014-03-07 21:47:30 +00:00
Greg Hackmann
86efcc0cbc
SurfaceFlinger: fix 64-bit format string warnings
...
Change-Id: Idacfbf0601743fba1c5de7632201a66a307a2710
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-07 12:45:13 -08:00
Dave Allison
d93707342a
ART profiler
...
Add args to the installd commands for profiler usage.
Make installd create the profile files and allow apps
to write to them.
The profile files are in /data/dalvik-cache/profiles. This
central location is needed due to permissions issues with
dex2oat reading from an app's data directory. The solution
is to put the profile file in a directory owned by the
install user and make the file writeable by the shared group
id of for the app. The app can read and write to these files
only in the profiles directory. The 'system' user also needs
to be able to read the files in order to determine the amount
of change to the file over time.
Bug: 12877748
Change-Id: I9b8e59e3bd7df8a1bf60fa7ffd376a24ba0eb42f
Conflicts:
cmds/installd/commands.c
2014-03-07 12:35:52 -08:00
Aravind Akella
05fe2d1cfb
am c339554f
: am 3a867ddc
: am 19d64819
: Bug fix for SensorFusion data rate.
...
* commit 'c339554f44550015c3a2aaa9c99cc53cc84ff590':
Bug fix for SensorFusion data rate.
2014-03-07 03:02:58 +00:00
Andy McFadden
6ef57d7b36
Restore old OpenGL tests
...
These tests call android_createDisplaySurface() to get a
FramebufferNativeWindow that is passed to EGL. This relies on the
existence of the framebuffer HAL, which is not supported on many
recent devices.
This change adds a new "window surface" object that the tests
can use to get a window from SurfaceFlinger instead. All tests
except for the HWC tests now appear to do things.
The HWC tests don't do anything useful, but they no longer depend
on the android_createDisplaySurface() function.
Bug 13323813
Change-Id: I2cbfbacb3452fb658c29e945b0c7ae7c94c1a4ba
2014-03-06 16:46:59 -08:00
Aravind Akella
c339554f44
am 3a867ddc
: am 19d64819
: Bug fix for SensorFusion data rate.
...
* commit '3a867ddcdc7c65f6b07d2eeeebf6a3e520bd1cf0':
Bug fix for SensorFusion data rate.
2014-03-06 22:45:48 +00:00
Aravind Akella
3a867ddcdc
am 19d64819
: Bug fix for SensorFusion data rate.
...
* commit '19d648195673b106152610e3787c95886946460f':
Bug fix for SensorFusion data rate.
2014-03-06 22:16:15 +00:00
Aravind Akella
19d6481956
Bug fix for SensorFusion data rate.
...
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()
Bug: 12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
(cherry picked from commit 8850909038
)
2014-03-06 19:07:18 +00:00
Andy McFadden
c0c6a0cd4c
Merge "FramebufferNativeWindow.h is obsolete"
2014-03-06 15:31:39 +00:00
Aravind Akella
35348dc712
am e7643e43
: am 8ae7c02e
: am ffac23b2
: am 4b84704b
: Ignore flush complete events when recording last value for a sensor.
...
* commit 'e7643e431abc2d1b42ab1d68913ec22d0b180554':
Ignore flush complete events when recording last value for a sensor.
2014-03-06 02:57:23 +00:00
Aravind Akella
e7643e431a
am 8ae7c02e
: am ffac23b2
: am 4b84704b
: Ignore flush complete events when recording last value for a sensor.
...
* commit '8ae7c02e6ffb5533958d04ac0d8f4a8d77fdb734':
Ignore flush complete events when recording last value for a sensor.
2014-03-06 02:35:17 +00:00
Mathieu Chartier
d70ba5c7d1
am 1d84e256
: am 3c39e03c
: Merge "Don\'t pass in empty arg to dex2oat."
...
* commit '1d84e25648efcda02e53910530f59a3c3351f152':
Don't pass in empty arg to dex2oat.
2014-03-06 02:29:17 +00:00
Aravind Akella
8ae7c02e6f
am ffac23b2
: am 4b84704b
: Ignore flush complete events when recording last value for a sensor.
...
* commit 'ffac23b210a96e769fd79ae912b44a185e7d69bd':
Ignore flush complete events when recording last value for a sensor.
2014-03-06 02:24:29 +00:00
Aravind Akella
ffac23b210
am 4b84704b
: Ignore flush complete events when recording last value for a sensor.
...
* commit '4b84704b97300eff3ebfab85652e64d54149d205':
Ignore flush complete events when recording last value for a sensor.
2014-03-06 02:18:29 +00:00
Mathieu Chartier
62d0f901fd
Don't pass in empty arg to dex2oat.
...
We would occassionally pass in an empty arg "" instead of a NULL.
This caused problems since dex2oat isn't made to handle empty args.
(cherry picked from commit f53dbfeda3
)
Change-Id: Ia2d60b895391bf83b5d250c20ddb8a4917d347a6
2014-03-05 17:56:31 -08:00
Mathieu Chartier
1d84e25648
am 3c39e03c
: Merge "Don\'t pass in empty arg to dex2oat."
...
* commit '3c39e03c08094ce65608cae8a45dd726cf10b5c3':
Don't pass in empty arg to dex2oat.
2014-03-06 01:05:22 +00:00
Mathieu Chartier
3c39e03c08
Merge "Don't pass in empty arg to dex2oat."
2014-03-06 01:01:08 +00:00
Mathieu Chartier
f53dbfeda3
Don't pass in empty arg to dex2oat.
...
We would occassionally pass in an empty arg "" instead of a NULL.
This caused problems since dex2oat isn't made to handle empty args.
Change-Id: Ibb1aed64a4aa17459b2a75a5a2abcf13c7fa8ac7
2014-03-05 16:58:48 -08:00
Aravind Akella
4b84704b97
Ignore flush complete events when recording last value for a sensor.
...
Bug: 11822806
Change-Id: I1402d6684ed71ed413aef6a7be3aad945b331ec2
2014-03-06 00:48:59 +00:00
Andy McFadden
2e336496c3
FramebufferNativeWindow.h is obsolete
...
This adds a deprecation #warning to the header.
Change-Id: Ia32f16e491cb01d435ec8846dda3d9a7d1a9cfc5
2014-03-05 15:42:53 -08:00
Brian Carlstrom
cd44310a13
am c9e60374
: am e19c99aa
: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"
...
* commit 'c9e60374f5144e94103e5b866570be114aa165c8':
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
2014-03-05 22:33:26 +00:00
Brian Carlstrom
c9e60374f5
am e19c99aa
: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"
...
* commit 'e19c99aad605c395f53bf39ae1a27e298e7e33ce':
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
2014-03-05 20:09:46 +00:00
Brian Carlstrom
e19c99aad6
Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"
2014-03-05 20:02:00 +00:00
Dan Stoza
c1ef3efecb
Merge "Change BufferQueue into producer/consumer wrapper"
2014-03-05 18:55:13 +00:00
Michael Wright
52badfb341
am f8da9623
: (-s ours) am 1298c7e5
: Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev
...
* commit 'f8da9623f3f565d0be9ade3d3439c45aa23dd229':
Parse LED mappings in keylayout files. DO NOT MERGE
2014-03-05 01:00:51 +00:00
Michael Wright
f8da9623f3
am 1298c7e5
: Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev
...
* commit '1298c7e527fd242a39f9c0d53aa4f35d1c9decab':
Parse LED mappings in keylayout files. DO NOT MERGE
2014-03-05 00:54:24 +00:00
Michael Wright
1298c7e527
Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev
2014-03-05 00:51:43 +00:00
Dan Stoza
3e96f1982f
Change BufferQueue into producer/consumer wrapper
...
Now that BufferQueue has been split into core + producer + consumer,
rewrite BufferQueue to be a thin layer over a producer and consumer
interface. Eventually, this layer will be deprecated in favor of
only using either the producer or consumer interface, as applicable.
Change-Id: I340ae5f5b633b244fb594615ff52ba50b9e2f7e4
2014-03-04 15:58:03 -08:00
Igor Murashkin
8be494eb09
am 1738d4fc
: am 462fb3a8
: Merge "gui: Fix return code assert in CpuConsumer_test."
...
* commit '1738d4fca78b7678d09d5c8898e1f80fa63b4a6d':
gui: Fix return code assert in CpuConsumer_test.
2014-03-04 22:35:04 +00:00
Brian Carlstrom
0ae8e39ebc
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
...
Change-Id: Ic048ed654ea0ae38c9684e5fa5b14742b6b83305
2014-03-04 14:11:55 -08:00
Igor Murashkin
1738d4fca7
am 462fb3a8
: Merge "gui: Fix return code assert in CpuConsumer_test."
...
* commit '462fb3a8d597fffef3d5534544428d5cee9d8c16':
gui: Fix return code assert in CpuConsumer_test.
2014-03-04 21:10:33 +00:00
Igor Murashkin
462fb3a8d5
Merge "gui: Fix return code assert in CpuConsumer_test."
2014-03-04 21:05:41 +00:00
Dan Stoza
4a07dc8d21
Merge "Split BufferQueue into core + producer + consumer"
2014-03-04 20:03:59 +00:00
Mark Salyzyn
d5bb577de0
am eac548c6
: am 61d6a008
: Merge "hwc test: 64-bit compilation error"
...
* commit 'eac548c65c30b04983a8c904f9a1c6003d428196':
hwc test: 64-bit compilation error
2014-03-04 19:22:43 +00:00
Mark Salyzyn
eac548c65c
am 61d6a008
: Merge "hwc test: 64-bit compilation error"
...
* commit '61d6a00895d2e8b9085278d0acbf98c19e7d6ed5':
hwc test: 64-bit compilation error
2014-03-04 19:18:03 +00:00
Mark Salyzyn
61d6a00895
Merge "hwc test: 64-bit compilation error"
2014-03-04 19:10:29 +00:00
Dan Stoza
289ade165e
Split BufferQueue into core + producer + consumer
...
Change-Id: Idc39f1e511d68ce4f02202d35425a419bc0bcd92
2014-03-04 09:33:14 -08:00
Mark Salyzyn
e933c0396f
hwc test: 64-bit compilation error
...
* cast 1u to size_t in max() argument lists
Change-Id: I02f711c89e96e4cfc348f1c7bac455339bec2fa1
2014-03-04 09:11:04 -08:00
Simon Wilson
08d6aa9a90
am 8ffc2346
: am 6e79cb81
: Enable OMAP4 SGX workaround for OMAP3 too
...
* commit '8ffc2346b86ef5a0d686b43229d2bbd70545a208':
Enable OMAP4 SGX workaround for OMAP3 too
2014-03-04 01:00:23 +00:00
Simon Wilson
8ffc2346b8
am 6e79cb81
: Enable OMAP4 SGX workaround for OMAP3 too
...
* commit '6e79cb81d02984c9f7ac0586078f947c94c56c2a':
Enable OMAP4 SGX workaround for OMAP3 too
2014-03-04 00:20:43 +00:00
Michael Wright
962a108856
Parse LED mappings in keylayout files. DO NOT MERGE
...
Change-Id: I2b34939cc0df256e6b872502ea93f2884b4c8334
2014-03-03 13:59:35 -08:00