Mark Salyzyn
d4dabf872a
am cdbf28b3
: Merge "native frameworks: 64-bit compile issues"
...
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
native frameworks: 64-bit compile issues
2014-03-13 15:26:10 +00:00
Mark Salyzyn
cdbf28b3f7
Merge "native frameworks: 64-bit compile issues"
2014-03-13 15:20:45 +00:00
RoboErik
ffd353a73e
am d9e113f0
: b/12068020 add nonce to InputDeviceDescriptor. Do not merge
...
* commit 'd9e113f0e0feac1a801f8339d2f907302bd432c5':
b/12068020 add nonce to InputDeviceDescriptor. Do not merge
2014-03-12 21:12:28 +00:00
Mark Salyzyn
92dc3fc52c
native frameworks: 64-bit compile issues
...
- Fix format (print/scanf)
- Suppress unused argument warning messages (bonus)
Change-Id: I05c7724d2aba6da1e82a86000e11f3a8fef4e728
2014-03-12 13:12:44 -07:00
RoboErik
d9e113f0e0
b/12068020 add nonce to InputDeviceDescriptor. Do not merge
...
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/401795/
Adds a nonce field to allow generation of unique descriptors for
input devices.
Change-Id: Ie82bfb728bea95792b3b138dd3974f8b0aff63e0
2014-03-12 12:51:54 -07:00
Anwar Ghuloum
85864b8724
am 06ed9491
: Merge "Fix parameter ordering for installd\'s dex2oat execl."
...
* commit '06ed9491418ce84e4272bf4201545fa6cfe3932e':
Fix parameter ordering for installd's dex2oat execl.
2014-03-11 23:43:19 +00:00
Michael Wright
d0f7ce457c
am 9b04f860
: Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
...
* commit '9b04f860f23481d39c3b45379a324d3630966825':
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
2014-03-11 23:22:00 +00:00
Anwar Ghuloum
06ed949141
Merge "Fix parameter ordering for installd's dex2oat execl."
2014-03-11 23:11:02 +00:00
Anwar Ghuloum
4bc054019d
Fix parameter ordering for installd's dex2oat execl.
...
Change-Id: Ibd6fd46c6ec3137874f9a3d5eea134bc804e039a
2014-03-11 15:42:58 -07:00
Michael Wright
9b04f860f2
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
...
Change-Id: Ie6dbce926280c748f39e3c54d2ed4accbdcf9e59
2014-03-11 14:19:33 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
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
Narayan Kamath
93e6a48b3e
Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
2014-02-27 13:17:58 +00:00
Ashok Bhat
d61b48c090
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
...
This will allow eglGetDisplay(int) to work on both 32-bit
and 64-bit systems when EGL_DEFAULT_DISPLAY is passed as
a parameter.
Change-Id: I0d7e9ca5410b0dd893eacc02aac40956908e4f25
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-26 19:06:27 +00:00