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
Igor Murashkin
c0308d7600
Merge "gui: Surface::dequeueBuffer no locker holds mutex while blocking in binder"
2014-03-03 21:11:55 +00:00
Lajos Molnar
c26c0bee1d
Merge "Adding Opus related struct definitions to OMX_Index"
2014-03-03 21:03:34 +00:00
Vignesh Venkatasubramanian
1a8b0ed985
Adding Opus related struct definitions to OMX_Index
...
Adding Opus related structure and constant definitions to
OMX_Index.h
Change-Id: Iae0394c86900f0db322893ffce695f854624833a
2014-03-03 12:01:33 -08:00
Igor Murashkin
0f1889efe7
gui: Surface::dequeueBuffer no locker holds mutex while blocking in binder
...
- This also fixes a hang in the camera service when trying to shut down
if the producer is infinitely blocked while trying to get a new buffer.
Bug: 13250382
Change-Id: I32ca82162bb8645b97dbe084e13e05ca05529a42
2014-03-03 11:42:27 -08:00
Ying Wang
646e2fbd91
am 0a643374
: am 6b4e5b7f
: Merge "Fix misuse of ."
...
* commit '0a6433749dcd87039f6e31c04ea662b238310b17':
Fix misuse of $(my-dir).
2014-03-01 02:22:55 +00:00
Ying Wang
0a6433749d
am 6b4e5b7f
: Merge "Fix misuse of ."
...
* commit '6b4e5b7f856c32b75e9a22df4c3f2273ae906acb':
Fix misuse of $(my-dir).
2014-03-01 02:15:39 +00:00
Ying Wang
6b4e5b7f85
Merge "Fix misuse of $(my-dir)."
2014-03-01 02:10:27 +00:00
Ying Wang
a3cc7edfce
Fix misuse of $(my-dir).
...
Change-Id: I8b24f60826abe4b541de646cbc3df66929203301
2014-02-28 18:05:56 -08:00
Simon Wilson
6e79cb81d0
Enable OMAP4 SGX workaround for OMAP3 too
...
Change-Id: I04308d8b7435b4adf1811f75f48f9e8a07a8c8a6
2014-02-28 14:30:39 -08:00
Narayan Kamath
87eb08dc07
am ad0f05be
: am b98c4761
: Merge "Correcting include path in installd test project\'s Android.mk"
...
* commit 'ad0f05bed95dc816a5b1e4bea23b0736458c1857':
Correcting include path in installd test project's Android.mk
2014-02-28 16:23:59 +00:00
Narayan Kamath
ad0f05bed9
am b98c4761
: Merge "Correcting include path in installd test project\'s Android.mk"
...
* commit 'b98c4761e0c80a8d8138910e0a5e5fc8baff8282':
Correcting include path in installd test project's Android.mk
2014-02-28 16:19:30 +00:00
Narayan Kamath
b98c4761e0
Merge "Correcting include path in installd test project's Android.mk"
2014-02-28 16:00:55 +00:00
Ramin Zaghi
7400742285
Correcting include path in installd test project's Android.mk
...
installd project has moved from frameworks/base to frameworks/native
and so its test project's c_include path defined in Android.mk
has to match the change.
Change-Id: I597125ff659f51edbd9fc95371790e2d567c78be
2014-02-28 15:41:57 +00:00
Narayan Kamath
622b6b28f2
Fix bad link tag in javadoc.
...
Java7 javadoc tools seem to accept this without complaint
but not all targets use java7 yet.
Change-Id: Ib08be8ad0f7db2e89f38b764cce858d0e7eecd2e
2014-02-28 14:05:52 +00:00
Narayan Kamath
f5684052f2
Merge "API changes for 64 bit platforms."
2014-02-28 13:21:07 +00:00
Xia Wang
6bc1ad7762
Merge "Build the benchmark test to /data/local/tmp/ for automated test"
2014-02-27 19:19:09 +00:00
Narayan Kamath
a90086a914
API changes for 64 bit platforms.
...
EGLObjectHandle.<init>(int) and int EGLObjectHandle.getHandle()
have now been deprecated and replaced with variants that take
and return java longs.
bug: 13181704
Change-Id: Ie88e591c288d6de5655364b4cd673f61cce68d7d
2014-02-27 14:12:55 +00:00
Narayan Kamath
2c95c57b62
am 3e599252
: am 93e6a48b
: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
...
* commit '3e599252c0f5a8e70f4b8d4ab5baffb7e5b0b0e1':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
2014-02-27 13:29:42 +00:00
Narayan Kamath
3e599252c0
am 93e6a48b
: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
...
* commit '93e6a48b3e876708a8161a9946581f5e8ebb382f':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
2014-02-27 13:23:09 +00:00