Chih-hung Hsieh
c4764f9e57
am 7d831769
: am 46ca041f
: Merge "Don\'t error out because SensorEventConnection::dump overloads BBinder::dump"
...
* commit '7d831769fce188251afb02e6b933be7bdfe504b4':
Don't error out because SensorEventConnection::dump overloads BBinder::dump
2014-11-26 00:01:55 +00:00
Chih-hung Hsieh
7d831769fc
am 46ca041f
: Merge "Don\'t error out because SensorEventConnection::dump overloads BBinder::dump"
...
* commit '46ca041f43e3d80029782b12c994b232dc01b5d5':
Don't error out because SensorEventConnection::dump overloads BBinder::dump
2014-11-25 23:55:52 +00:00
Chih-hung Hsieh
46ca041f43
Merge "Don't error out because SensorEventConnection::dump overloads BBinder::dump"
2014-11-25 23:45:38 +00:00
Bernhard Rosenkränzer
72952efe5c
Don't error out because SensorEventConnection::dump overloads BBinder::dump
...
clang warns about SensorEventConnection::dump overloading BBinder::dump
in some conditions.
Since the cause isn't fixable without changing the API, tell clang not
to error out on it.
Change-Id: I15659de7c5499d937019599cfefb01305039e6b5
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-25 15:42:27 -08:00
Chih-hung Hsieh
627086c2ef
am a7c75d1b
: am 2d7ec9d7
: Merge "Fix build with clang in C++11 mode"
...
* commit 'a7c75d1b17556d9842a7823c94a2c96982687c63':
Fix build with clang in C++11 mode
2014-11-25 23:01:13 +00:00
Chih-hung Hsieh
a7c75d1b17
am 2d7ec9d7
: Merge "Fix build with clang in C++11 mode"
...
* commit '2d7ec9d7b5dfdb93930b94c134fa2dc10fd27313':
Fix build with clang in C++11 mode
2014-11-25 22:56:02 +00:00
Chih-hung Hsieh
2d7ec9d7b5
Merge "Fix build with clang in C++11 mode"
2014-11-25 22:43:44 +00:00
Bernhard Rosenkränzer
74debb0b8f
Fix build with clang in C++11 mode
...
Now that we're in C++11 mode by default, clang complains about switch
statements with case values not matching the type -- since some
binder_driver_return_protocol values are > 0x7fffffff, we need to make
the switch statements operate on uint32_t rather than int32_t.
BUG: 18466763
Change-Id: Iedbfd5c7a3d3d9f087d2eab4ff21343ad7a2a448
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-25 14:06:04 -08:00
chh
5394346ada
am 22b99e3a
: am 45aa0227
: Merge "Fix potential format string vulnerability"
...
* commit '22b99e3a9a5797deada897102e71e9a88ae46d24':
Fix potential format string vulnerability
2014-11-25 19:57:17 +00:00
Andreas Gampe
b54d73d972
am 09efe0ac
: am 2e42a906
: Merge "Binder: Remove unused functions & variables"
...
* commit '09efe0ac2a0f34eb951c9a2b91b2d15e3ab7b7ca':
Binder: Remove unused functions & variables
2014-11-25 19:56:30 +00:00
chh
22b99e3a9a
am 45aa0227
: Merge "Fix potential format string vulnerability"
...
* commit '45aa022710165c321cdec9a475f269d6932fe1f3':
Fix potential format string vulnerability
2014-11-25 19:04:12 +00:00
Michael Lentine
347a2acf7e
am 1e611662
: am b947f29a
: Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
...
* commit '1e6116621bc2f7aedfd52a5f1327b530328435b0':
Add clamp to Layer and update Transform inverse.
2014-11-25 18:56:41 +00:00
Andreas Gampe
09efe0ac2a
am 2e42a906
: Merge "Binder: Remove unused functions & variables"
...
* commit '2e42a90653abd0fc8a76909b5f101782d187136e':
Binder: Remove unused functions & variables
2014-11-25 18:52:24 +00:00
Michael Lentine
1e6116621b
am b947f29a
: Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
...
* commit 'b947f29a6af1622cda16d0b7112595082750dd07':
Add clamp to Layer and update Transform inverse.
2014-11-25 18:44:51 +00:00
Dianne Hackborn
6147e8c8e7
am bbe43a4c
: am e8a4dce8
: Merge "Work on issue #18486438 : Reduce size of bugreport output" into lmp-mr1-dev
...
* commit 'bbe43a4cdd0ea9a06d09e451dc256b7de59b5817':
Work on issue #18486438 : Reduce size of bugreport output
2014-11-25 17:43:21 +00:00
Dianne Hackborn
bbe43a4cdd
am e8a4dce8
: Merge "Work on issue #18486438 : Reduce size of bugreport output" into lmp-mr1-dev
...
* commit 'e8a4dce8169ba5fdcd86a5fc29aa6986de1711b0':
Work on issue #18486438 : Reduce size of bugreport output
2014-11-25 17:36:43 +00:00
chh
45aa022710
Merge "Fix potential format string vulnerability"
2014-11-25 01:04:09 +00:00
Bernhard Rosenkränzer
5f6199373d
Fix potential format string vulnerability
...
A sensor name containing a format string could have interesting side
effects...
Change-Id: If7f1378aa68572d9716c339728eab18faa6b9f2a
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-24 16:59:39 -08:00
Michael Lentine
b947f29a6a
Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
2014-11-25 00:56:54 +00:00
Andreas Gampe
2e42a90653
Merge "Binder: Remove unused functions & variables"
2014-11-24 20:32:41 +00:00
Andreas Gampe
0b53b5c0b3
Binder: Remove unused functions & variables
...
For build-system CFLAGS clean-up, remove unused functions and
variables.
Change-Id: I88abc2bc99e6b91c7aa56470ff9671bf8bf29f8d
2014-11-24 11:39:11 -08:00
Eino-Ville Talvala
a5be9e3c08
am 6086365e
: am 9c08f6c8
: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
...
* commit '6086365e41e0e1656e8bfffdf4b70f897f080994':
Camera: Add XML entries and files for new system features
2014-11-24 18:12:10 +00:00
Eino-Ville Talvala
6086365e41
am 9c08f6c8
: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
...
* commit '9c08f6c8364ce82c3855ad8c6ee98cb2c6595141':
Camera: Add XML entries and files for new system features
2014-11-24 18:05:35 +00:00
Dianne Hackborn
e8a4dce816
Merge "Work on issue #18486438 : Reduce size of bugreport output" into lmp-mr1-dev
2014-11-24 17:53:55 +00:00
Narayan Kamath
84436ec0ba
am 769c779c
: am 8e5fdac4
: Merge "Mark 2 unused paramters as such"
...
* commit '769c779ce6dbc0ae780b33956be78bb6944e0705':
Mark 2 unused paramters as such
2014-11-24 13:28:56 +00:00
Narayan Kamath
769c779ce6
am 8e5fdac4
: Merge "Mark 2 unused paramters as such"
...
* commit '8e5fdac4de722d4f1333471a5a60412a0db2d1df':
Mark 2 unused paramters as such
2014-11-24 13:24:58 +00:00
Narayan Kamath
8e5fdac4de
Merge "Mark 2 unused paramters as such"
2014-11-24 13:16:37 +00:00
Bernhard Rosenkränzer
7fb390d10c
Mark 2 unused paramters as such
...
Mark 2 unused paramters to prevent clang from erroring out
Change-Id: Ifc9b4a5b820bd6318e9259e737e708d25fdb174b
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-23 22:28:26 +01:00
Elliott Hughes
7a6037e914
am f167968b
: am e0f91c37
: Merge "We HAVE_LITTLE_ENDIAN."
...
* commit 'f167968b4667df017958a653f74c60831faf5ad8':
We HAVE_LITTLE_ENDIAN.
2014-11-22 08:04:43 +00:00
Elliott Hughes
f167968b46
am e0f91c37
: Merge "We HAVE_LITTLE_ENDIAN."
...
* commit 'e0f91c3731b16b010eb31117e941e5468bdfeb2e':
We HAVE_LITTLE_ENDIAN.
2014-11-22 08:01:17 +00:00
Elliott Hughes
e0f91c3731
Merge "We HAVE_LITTLE_ENDIAN."
2014-11-22 07:49:32 +00:00
Elliott Hughes
a5d7459936
We HAVE_LITTLE_ENDIAN.
...
Change-Id: I68551ad663f2649a06b1958e9bef152e6d026e72
2014-11-21 23:35:36 -08:00
Eino-Ville Talvala
9c08f6c836
Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
2014-11-22 04:57:51 +00:00
Eino-Ville Talvala
e86d109176
Camera: Add XML entries and files for new system features
...
Add BURST_CAPTURE and READ_SENSOR_SETTINGS.
Bug: 18281970
Change-Id: Ibf596c97fbca46f2ae044b6c87586d76605a5163
2014-11-21 20:52:56 -08:00
Michael Lentine
28ea217ff4
Add clamp to Layer and update Transform inverse.
...
Ensure that the adjusted transparent region is within
the display bounds by clamping after the transformation
is applied and clean up transform's inverse function.
Bug: 18452546
Change-Id: Ia473e483ee8374177bcb84d8192eb1f0e86f022a
2014-11-21 17:05:18 -08:00
Dianne Hackborn
4ba58f69cd
Work on issue #18486438 : Reduce size of bugreport output
...
Don't put packages.xml in to the output.
Change-Id: I88a682866365886506a003a64deb4a29c16ba21c
2014-11-21 16:41:31 -08:00
Greg Hackmann
6c04557969
am 236e7906
: am e4c7ec84
: Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
...
* commit '236e790608aa3d60630d3946f54fb9a3ae01b19f':
atrace: make fs-specific sysfs entries optional
2014-11-21 23:12:58 +00:00
Greg Hackmann
236e790608
am e4c7ec84
: Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
...
* commit 'e4c7ec847d83edfb54c215f3ab6093efeb17a586':
atrace: make fs-specific sysfs entries optional
2014-11-21 20:36:08 +00:00
Greg Hackmann
e4c7ec847d
Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
2014-11-21 20:27:08 +00:00
Mike Lockwood
210e24c07e
am 8b1a2774
: am 754f16fc
: Merge "Fix installd command line parser"
...
* commit '8b1a27740dc9910ffbdf0df775056b6647fe111c':
Fix installd command line parser
2014-11-21 12:19:01 +00:00
Mike Lockwood
8b1a27740d
am 754f16fc
: Merge "Fix installd command line parser"
...
* commit '754f16fcf4b56f52450f91e3e840bad8a2cc997c':
Fix installd command line parser
2014-11-21 05:10:57 +00:00
Mike Lockwood
754f16fcf4
Merge "Fix installd command line parser"
2014-11-21 05:02:51 +00:00
Lajos Molnar
b2dcde5213
am eb0ad057
: am a63caa19
: Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
...
* commit 'eb0ad057628f18bf762084b5bbefa81c3a228e3f':
omx: add (temporary) index for automatic video frc support
Fix issue #18356768 : some app process may hang at Runtime#exit...
2014-11-20 23:19:33 +00:00
Dan Albert
325c4c9aa7
resolved conflicts for merge of c1ced8bb
to master
...
Change-Id: I83db00ff986ace8a1c77648738b93124613ddfc0
2014-11-20 15:16:22 -08:00
Elliott Hughes
47513e8739
am 8d84b6f9
: am ba4a43c6
: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
...
* commit '8d84b6f9f576fe51b2cb4a54042bf95af923e55b':
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
2014-11-20 23:09:45 +00:00
Lajos Molnar
eb0ad05762
am a63caa19
: Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
...
* commit 'a63caa1983138e561b2b033c5d178636beeb1578':
omx: add (temporary) index for automatic video frc support
Fix issue #18356768 : some app process may hang at Runtime#exit...
2014-11-20 23:05:47 +00:00
Dan Albert
c1ced8bbcd
am c894c204
: Merge "C++11 compatibility."
...
* commit 'c894c2045f589571c80af0648e7a9dcd7e97b6a8':
C++11 compatibility.
2014-11-20 23:00:48 +00:00
Elliott Hughes
8d84b6f9f5
am ba4a43c6
: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
...
* commit 'ba4a43c6c78547444446181b4fae20a5d61d35ff':
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
2014-11-20 23:00:26 +00:00
Dan Albert
c894c2045f
Merge "C++11 compatibility."
2014-11-20 22:06:44 +00:00
Greg Hackmann
e80d32c3c2
atrace: make fs-specific sysfs entries optional
...
The availability of these sysfs entries will vary based on the kernel's
supported filesystems, so don't block the disk category if some of them
are missing.
Bug: 18467498
Change-Id: I96200f1b5cf3f1a8fa8186602552adc96ddffc04
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-11-20 21:10:45 +00:00