Commit Graph

51419 Commits

Author SHA1 Message Date
Dan Stoza e4ea03f74d am 80e81505: Merge "binder: Add {read,write}Uint32 methods to Parcel"
* commit '80e8150549c9d8380dadf942336d41ab3d92bf78':
  binder: Add {read,write}Uint32 methods to Parcel
2014-12-01 19:27:00 +00:00
Dan Stoza 32ad1d518b am 104e1259: Merge "binder: Return pid_t/uid_t instead of int"
* commit '104e12594e085bc8dd32eedb96643b774b1508a0':
  binder: Return pid_t/uid_t instead of int
2014-12-01 19:23:22 +00:00
Dan Stoza 80e8150549 Merge "binder: Add {read,write}Uint32 methods to Parcel" 2014-12-01 19:16:17 +00:00
Dan Stoza 41a0f2f86c binder: Add {read,write}Uint32 methods to Parcel
Adds readUint32 and writeUint32 methods to the Parcel class. This
saves a lot of static_casting in anything implementing a Binder
interface on the native side.

Change-Id: Iafc73b0633654a3a4c49767f41806b56906c924f
2014-12-01 11:13:11 -08:00
Dan Stoza 104e12594e Merge "binder: Return pid_t/uid_t instead of int" 2014-12-01 19:10:58 +00:00
Dan Stoza 9c634fd2d1 binder: Return pid_t/uid_t instead of int
Makes IPCThreadState::getCalling{Pid,Uid} return a more
appropriate type.

Change-Id: I97f8a83c1c0722bc1afbf8a6df1a288f8f1f0d2c
2014-12-01 11:07:14 -08: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 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 22b99e3a9a am 45aa0227: Merge "Fix potential format string vulnerability"
* commit '45aa022710165c321cdec9a475f269d6932fe1f3':
  Fix potential format string vulnerability
2014-11-25 19:04:12 +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 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 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 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 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 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 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 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
Dan Albert 3bdc5b8268 C++11 compatibility.
* Explicit conversion for atomic_uintptr_t initialization.
 * Fix string literal concatenation to not be a UD literal.
 * Use __typeof__ instead of typeof (should become decltype once this
   actually moves to C++11).

Bug: 18466763
Change-Id: I4eedddfb945a2a703ed27317cb6e2b3041b1ebfc
2014-11-20 21:04:35 +00:00
Elliott Hughes ba4a43c6c7 Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS." 2014-11-20 20:58:53 +00:00
Elliott Hughes 9a4e7f492e Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Change-Id: I692179cae9d476dd5a0b5fa92813b61934dd7c87
2014-11-20 12:54:21 -08:00
Narayan Kamath 1bdade0571 resolved conflicts for merge of fd5a3e06 to lmp-mr1-dev-plus-aosp
Change-Id: Ib4578fab76fdbb8deda016f065b60dcb172d3ad2
2014-11-20 11:04:43 +00:00
Narayan Kamath fd5a3e06c2 Merge "Add an installd command to mark the end of boot." 2014-11-20 10:47:11 +00:00
Lajos Molnar a63caa1983 Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev 2014-11-20 06:44:42 +00:00
Lajos Molnar 76d4c5cf73 omx: add (temporary) index for automatic video frc support
Bug: 17383204
Change-Id: I9b22da03ea3f2a7d9dd85042fff442d2414cbc26
2014-11-19 16:09:49 -08:00
Narayan Kamath 091ea779d4 Add an installd command to mark the end of boot.
bug: 18280671

(cherry picked from commit b1a6c2f95a)

Change-Id: I97542875ffff1b68ab324e9b04fb9266c82633cc
2014-11-19 14:43:05 +00:00