OSDN Git Service
Elliott Hughes [Wed, 4 May 2016 22:13:14 +0000 (22:13 +0000)]
Merge "Switch to more conventional ps arguments in dumpstate."
Elliott Hughes [Wed, 4 May 2016 21:03:54 +0000 (14:03 -0700)]
Switch to more conventional ps arguments in dumpstate.
I'll come back and remove the "toybox" once I've switched the symlink
from toolbox to toybox...
Change-Id: I00f848ab4dade8650726b054429a2926d3d72018
Chih-hung Hsieh [Mon, 2 May 2016 17:14:48 +0000 (17:14 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Fri, 29 Apr 2016 23:23:55 +0000 (16:23 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I83bb2282249ecd4e39347b90f5fb53788e1fff5b
Treehugger Robot [Thu, 28 Apr 2016 15:11:54 +0000 (15:11 +0000)]
Merge "Fix google-explicit-constructor warnings."
Treehugger Robot [Tue, 26 Apr 2016 23:29:34 +0000 (23:29 +0000)]
Merge "Atrace:use ReadFileToString to read file"
Christopher Wiley [Tue, 26 Apr 2016 16:09:57 +0000 (16:09 +0000)]
Merge "libbinder: Replace ScopedFd with base::unique_fd"
Elliott Hughes [Mon, 25 Apr 2016 23:22:31 +0000 (23:22 +0000)]
Merge "Remove HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE test."
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:41:05 +0000 (15:41 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I0ce850de85e0de6a5472dd142f738856142db9ec
Elliott Hughes [Mon, 25 Apr 2016 20:17:48 +0000 (13:17 -0700)]
Remove HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE test.
This is no longer defined anywhere, and has never existed on LP64.
Change-Id: Ic2c51410526f6adbdfe872d4c3b99cbe3badb8d1
Christopher Wiley [Mon, 11 Apr 2016 18:09:37 +0000 (11:09 -0700)]
libbinder: Replace ScopedFd with base::unique_fd
unique_fd is a more canonical construct going forward.
Bug:
27804373
Test: checkbuilds pass on aosp x86_64-eng
Change-Id: I53eca34c0f4fd00be770a6898ff06ec2e98b9c8e
Stephane Gasparini [Wed, 2 Mar 2016 12:45:15 +0000 (13:45 +0100)]
Atrace:use ReadFileToString to read file
Since wildcard support was added to atrace, it can happen
very easily that file size is large than 4096
resulting in bad status that atrace cannot find kernel function
This patch use android::base::ReadFileToString to read file
which doesn't have size limitation.
Signed-off-by: Stephane Gasparini <stephane.gasparini@intel.com>
Change-Id: Ic24a9267053302a03ff04c8b2afeb143e5b94c84
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Treehugger Robot [Tue, 19 Apr 2016 18:30:20 +0000 (18:30 +0000)]
Merge "Include libbase headers in libbinder include path"
Christopher Wiley [Tue, 19 Apr 2016 17:27:00 +0000 (10:27 -0700)]
Include libbase headers in libbinder include path
We will eventually switch to using libbase's unique_fd in favor of
ScopedFd. Include the header by itself to check that all build targets
that need libbinder headers are picking up libbase as well.
Bug:
27804373
Test: Compiles
Change-Id: I2920b3d1a5357d81a54267febac3ab72fee88eb1
Treehugger Robot [Tue, 19 Apr 2016 15:23:56 +0000 (15:23 +0000)]
Merge "libgui should re-export libbinder include paths"
Christopher Wiley [Mon, 18 Apr 2016 22:50:56 +0000 (15:50 -0700)]
libgui should re-export libbinder include paths
libgui headers include headres from libbinder. Therefor, consumers
need the complete include paths of both libries.
Bug:
27804373
Change-Id: I4c355f32fb58298059abf7c546b48e8b24b4dc3c
Test: Compiles when libbinder include path changes.
Christopher Wiley [Mon, 18 Apr 2016 17:42:06 +0000 (17:42 +0000)]
Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd""
Christopher Wiley [Mon, 18 Apr 2016 17:40:56 +0000 (17:40 +0000)]
Revert "libbinder: Replace ScopedFd with base::unique_fd"
This reverts commit
b12c5a67f9cf5a55f67c08bef898c48cefa9d03d.
Change-Id: I13ab8151376bc3bda7f96b92db7934720dc62215
Treehugger Robot [Mon, 18 Apr 2016 15:35:30 +0000 (15:35 +0000)]
Merge "libbinder: Replace ScopedFd with base::unique_fd"
Jorge Lucangeli Obes [Thu, 14 Apr 2016 17:10:50 +0000 (17:10 +0000)]
Merge "Run 'nativeperms', remove Brillo #ifdef."
Martijn Coenen [Thu, 14 Apr 2016 09:52:26 +0000 (09:52 +0000)]
Merge "Add missing include to choreographer header."
Michael Wright [Wed, 27 Jan 2016 00:05:54 +0000 (16:05 -0800)]
Add missing include to choreographer header.
Change-Id: Id497f3a505211309a08e100b369300e81f84b13b
Martijn Coenen [Thu, 14 Apr 2016 08:11:45 +0000 (08:11 +0000)]
Merge "Add NDK Choreographer API headers"
Treehugger Robot [Wed, 13 Apr 2016 23:53:25 +0000 (23:53 +0000)]
Merge "libbinder: Remove templated binder::Status stream operator."
Jorge Lucangeli Obes [Wed, 13 Apr 2016 23:42:34 +0000 (16:42 -0700)]
Run 'nativeperms', remove Brillo #ifdef.
Bug:
25663983
Change-Id: I5b9f9747695d75f84bdfb61f90d28e0e5fee612c
Jorge Lucangeli Obes [Wed, 13 Apr 2016 22:45:19 +0000 (22:45 +0000)]
Merge "Implement a stub permission server for Brillo tier 1."
Jorge Lucangeli Obes [Wed, 13 Apr 2016 18:01:25 +0000 (11:01 -0700)]
Implement a stub permission server for Brillo tier 1.
This will allow removing some existing hardcoded checks, like
https://cs.corp.google.com/android/frameworks/native/libs/binder/IServiceManager.cpp?l=70
Also add a .clang-format file for Android Framework C++ style.
Bug:
25663983
Change-Id: Icc4473a6f7b8c7395cdb167dc3fdbb2f076e5960
Ralph Nathan [Wed, 13 Apr 2016 19:42:06 +0000 (12:42 -0700)]
libbinder: Remove templated binder::Status stream operator.
The templated binder::Status stream operator doesn't work with gmock
because of ambiguous operator overloading. Limiting the stream operator
to just std::stringstream allows it to be used with gmock.
BUG=
28171901
TEST=Compiles with gmock and CameraBinderTests
Change-Id: Ia674b68cbff4911b3f5cc3d8ee57d04a1d6cf6bf
Christopher Wiley [Mon, 11 Apr 2016 18:09:37 +0000 (11:09 -0700)]
libbinder: Replace ScopedFd with base::unique_fd
unique_fd is a more canonical construct going forward.
Bug:
27804373
Test: checkbuilds pass on aosp x86_64-eng
Change-Id: I8c1f202f1a6d646b5468f8c08fdcab7ea7f3178b
Josh Gao [Fri, 8 Apr 2016 17:59:15 +0000 (17:59 +0000)]
Merge "Don't include <sys/sysconf.h>."
Michael Wright [Mon, 7 Dec 2015 20:26:38 +0000 (15:26 -0500)]
Add NDK Choreographer API headers
Change-Id: Ib75d3341db4e48b328b7b92497a303c01c53fc90
Josh Gao [Fri, 8 Apr 2016 00:33:02 +0000 (17:33 -0700)]
Don't include <sys/sysconf.h>.
It doesn't exist in any standard, and is hence being moved. <unistd.h>
exposes everything in it already, anyway.
Bug: http://b/
28067717
Change-Id: I258c607ef8799ec267151f424be27c72e295e3b6
Stephen Hines [Fri, 1 Apr 2016 20:07:51 +0000 (20:07 +0000)]
Merge "Split increments to silence a compiler warning."
Stephen Hines [Fri, 1 Apr 2016 05:02:38 +0000 (22:02 -0700)]
Split increments to silence a compiler warning.
Upstream clang complains that this line may be a possible misuse of the
comma operator, since the result from "p++" is being discarded. Rather
than overcomplicate things with a static_cast<void>(), it is easiest to
just move this to a separate statement.
Change-Id: I5d005eb82a02430f691f99a2f1e8b7237320f84a
Dan Austin [Mon, 28 Mar 2016 21:40:50 +0000 (21:40 +0000)]
Merge "Address const issues in preparation for libcxx rebase."
Stephen Hines [Mon, 28 Mar 2016 21:34:10 +0000 (21:34 +0000)]
Merge "Switch GLES wrappers over to using Clang (and fix inline assembly)."
Dan Austin [Thu, 24 Mar 2016 19:19:25 +0000 (12:19 -0700)]
Address const issues in preparation for libcxx rebase.
Change-Id: I25a1e2946217049e9205589d6493e06362d2173b
Stephen Hines [Wed, 23 Mar 2016 06:35:27 +0000 (23:35 -0700)]
Switch GLES wrappers over to using Clang (and fix inline assembly).
Bug: http://b/
18003438
The GLES wrapper implementations make direct calls to their underlying
function without specifying that they are retaining the original
argument register(s). This change makes the retention of these argument
registers more explicit, and then removes the LOCAL_CLANG override,
since Clang no longer optimizes the code into a bad state.
We also switch to "naked" functions, so that we control all stack layout
information. This prevents us from accidentally still corrupting
arguments on x86 (and for other functions with many parameters).
Change-Id: I37f2ef4a697373388950b41f0a292393c9fcbac7
Casey Dahlin [Tue, 15 Mar 2016 21:12:34 +0000 (21:12 +0000)]
Merge "Release resources when repeating dlopen-dlcose."
Christopher Wiley [Thu, 10 Mar 2016 23:32:15 +0000 (23:32 +0000)]
Merge "libbinder: Make null handling explicit for strong binders"
zhongjie [Wed, 9 Mar 2016 07:05:04 +0000 (15:05 +0800)]
Release resources when repeating dlopen-dlcose.
When the libbinder.so is dlopen and dlclose many
times, we need to delete the pthread_key and
munmap the memory mapping.
Otherwise, it will crash as the leakage causes
the pthread_key or memory mapping surpass their
limit.
Change-Id: Ice64d4ef685c1f665350286f9e5ddf790beac236
Signed-off-by: zhongjie <zhongjie.shi@intel.com>
Christopher Wiley [Tue, 8 Mar 2016 18:49:51 +0000 (10:49 -0800)]
libbinder: Make null handling explicit for strong binders
Bug:
27156495
Test: Compiles
Change-Id: I62cade1761377a9ec2921a758307582552e4c2ac
Zhiquan Liu [Thu, 3 Mar 2016 15:41:49 +0000 (15:41 +0000)]
Merge ""#warning" conflict with -Werror"
am:
e6b6843c5f
* commit '
e6b6843c5fc19976677706518c4875a78cc736bb':
"#warning" conflict with -Werror
Dan Stoza [Thu, 3 Mar 2016 15:36:33 +0000 (15:36 +0000)]
Merge ""#warning" conflict with -Werror"
Zhiquan Liu [Thu, 3 Mar 2016 07:24:41 +0000 (15:24 +0800)]
"#warning" conflict with -Werror
if code run #warning, it will have compile error.
Change-Id: Ic7f05cd722c14f3c5da89e2c3792615dd15cb798
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Bill Yi [Wed, 17 Feb 2016 19:36:59 +0000 (11:36 -0800)]
Christopher Wiley [Wed, 17 Feb 2016 17:41:04 +0000 (17:41 +0000)]
Merge "Allocate buffers locally in systems without SurfaceFlinger"
am:
afcf267cbd
* commit '
afcf267cbd86316cd98c96bc82400479c965d8d6':
Allocate buffers locally in systems without SurfaceFlinger
Christopher Wiley [Wed, 17 Feb 2016 17:32:15 +0000 (17:32 +0000)]
Merge "Allocate buffers locally in systems without SurfaceFlinger"
Christopher Wiley [Wed, 10 Feb 2016 23:33:14 +0000 (15:33 -0800)]
Allocate buffers locally in systems without SurfaceFlinger
In Brillo systems, we have no applications and configure
SELinux policy statically. In this model, we do not need
a special service to allocate buffers, since any process
that needs buffers can be appropriately marked at build time.
Bug:
26936651
Test: A test program on brilloemulator can allocate buffers for
the camera with this patch.
Change-Id: Ifcdb7a4b878f9a26f4899c7b75a12447dcdb0ac9
Samuel Tan [Tue, 16 Feb 2016 20:52:03 +0000 (20:52 +0000)]
Merge "libbinder: add getters for PersistableBundle keys"
am:
4f321d1629
* commit '
4f321d1629e2b848b4e9a5304ab4a9262bc81569':
libbinder: add getters for PersistableBundle keys
Samuel Tan [Tue, 16 Feb 2016 20:47:42 +0000 (20:47 +0000)]
Merge "libbinder: add getters for PersistableBundle keys"
Aurimas Liutikas [Tue, 16 Feb 2016 19:37:10 +0000 (19:37 +0000)]
Merge "Fix -Wgnu-designator warnigns in cmds/flatland/Main.cpp"
am:
f4475023e7
* commit '
f4475023e728db1456a72b0e9a1292e11fb38245':
Fix -Wgnu-designator warnigns in cmds/flatland/Main.cpp
Aurimas Liutikas [Tue, 16 Feb 2016 19:30:38 +0000 (19:30 +0000)]
Merge "Fix -Wgnu-designator warnigns in cmds/flatland/Main.cpp"
Aurimas Liutikas [Tue, 16 Feb 2016 18:42:52 +0000 (10:42 -0800)]
Fix -Wgnu-designator warnigns in cmds/flatland/Main.cpp
Bug: http://b/
27068438
Change-Id: I3064950f761411fe5271c6259867ad437c71e66d
Christopher Wiley [Tue, 16 Feb 2016 16:57:44 +0000 (16:57 +0000)]
Merge "Replace AppOpsManager locking with std::lock_guard"
am:
d3a9228d1d
* commit '
d3a9228d1d2388f21b4e8013cf2fad7b4c91ace7':
Replace AppOpsManager locking with std::lock_guard
Christopher Wiley [Tue, 16 Feb 2016 16:50:01 +0000 (16:50 +0000)]
Merge "Replace AppOpsManager locking with std::lock_guard"
Dimitry Ivanov [Sat, 13 Feb 2016 01:50:29 +0000 (01:50 +0000)]
Merge "Add missing liblog dependency"
am:
39f1abac3c
* commit '
39f1abac3c21e2f5a4a450b21d1c52ba5f099ddb':
Add missing liblog dependency
Dimitry Ivanov [Sat, 13 Feb 2016 01:43:29 +0000 (01:43 +0000)]
Merge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 13 Feb 2016 01:13:10 +0000 (17:13 -0800)]
Add missing liblog dependency
Bug: http://b/
27171986
Change-Id: Ifbe01c6b325e7198a95ea865f557b0c9acb65809
Christopher Wiley [Sat, 13 Feb 2016 00:07:49 +0000 (00:07 +0000)]
Merge "Don\'t rely on AppOpsManager in systems without applications"
am:
46c32a1b1c
* commit '
46c32a1b1c895ec7630686aa8228785479f8fe92':
Don't rely on AppOpsManager in systems without applications
Christopher Wiley [Sat, 13 Feb 2016 00:07:40 +0000 (00:07 +0000)]
Merge "Fix race in AppOpsManager client library"
am:
712fe62ab2
* commit '
712fe62ab282b3897fc1ee98e35b12d95663be52':
Fix race in AppOpsManager client library
Christopher Wiley [Fri, 12 Feb 2016 23:41:08 +0000 (15:41 -0800)]
Replace AppOpsManager locking with std::lock_guard
Change-Id: Ice4c101659837cea594194cfb335f9f3f6837f38
Christopher Wiley [Fri, 12 Feb 2016 23:43:07 +0000 (23:43 +0000)]
Merge "Don't rely on AppOpsManager in systems without applications"
Christopher Wiley [Fri, 12 Feb 2016 23:43:00 +0000 (23:43 +0000)]
Merge "Fix race in AppOpsManager client library"
Samuel Tan [Fri, 12 Feb 2016 21:56:17 +0000 (13:56 -0800)]
libbinder: add getters for PersistableBundle keys
Add getters for the keys in each map stored in
PersistableBundle. This will allow users of
PersistableBundle to iterate over entries of
a specific type in PersistableBundle.
Also, add "using" statements to PersistableBundle
for std containers to reduce verbosity.
BUG:
27171235
Change-Id: Idd4b3bf713071ca8d8d023f1f83bdaf3ccbdd46f
TEST: libbinder compiles successfully.
Casey Dahlin [Thu, 11 Feb 2016 23:31:07 +0000 (23:31 +0000)]
Merge "libbinder: Allow readByteVector to take uint8_t"
am:
dda39f2a22
* commit '
dda39f2a2229ea74cc4738daa1c6a1c758284d7d':
libbinder: Allow readByteVector to take uint8_t
Casey Dahlin [Thu, 11 Feb 2016 23:24:41 +0000 (23:24 +0000)]
Merge "libbinder: Allow readByteVector to take uint8_t"
Mark Salyzyn [Wed, 10 Feb 2016 16:13:54 +0000 (16:13 +0000)]
Merge "dumpstate: Continued build breakage"
am:
16072e7e17
* commit '
16072e7e1717bcf1ea8be99eb7af90974dbbeeb7':
dumpstate: Continued build breakage
Mark Salyzyn [Wed, 10 Feb 2016 16:12:50 +0000 (16:12 +0000)]
Merge "dumpstate: Continued build breakage"
Mark Salyzyn [Wed, 10 Feb 2016 15:41:12 +0000 (07:41 -0800)]
dumpstate: Continued build breakage
- drop assignment length in scanf
- drop -std=gnu99 as invalid for C++
Change-Id: I924d2561069b3c289cb9deb475f732c46bb5a67e
Casey Dahlin [Tue, 9 Feb 2016 19:08:35 +0000 (11:08 -0800)]
libbinder: Allow readByteVector to take uint8_t
Change-Id: I2f0d1f3b4c04f04e7a866e9a4cf76c899b4b4980
Test: AIDL integration tests pass
Bug:
27078230
Mark Salyzyn [Tue, 9 Feb 2016 17:25:01 +0000 (17:25 +0000)]
Merge changes I6b499f53,If821ed21
am:
c658aee7d6
* commit '
c658aee7d6dc56b1b3b1722412029830e966ba71':
dumpstate: report process times
Add option to #define _DUMPSTATE_DRY_RUN_ to skip the actual dumps.
Mark Salyzyn [Tue, 9 Feb 2016 17:22:50 +0000 (17:22 +0000)]
Merge changes I6b499f53,If821ed21
* changes:
dumpstate: report process times
Add option to #define _DUMPSTATE_DRY_RUN_ to skip the actual dumps.
Mark Salyzyn [Fri, 5 Feb 2016 23:33:17 +0000 (15:33 -0800)]
dumpstate: report process times
- Fix per-pid helper to pick up comm if cmdline is empty
and assume kernel thread.
- Add per pid report command line user time if not kernel thread,
system time and I/O time, plus percentage if non zero.
Bug:
26966375
Change-Id: I6b499f535cc3687eb468b32ae39e7d151dffb11f
Felipe Leme [Wed, 11 Nov 2015 04:10:25 +0000 (20:10 -0800)]
Add option to #define _DUMPSTATE_DRY_RUN_ to skip the actual dumps.
(cherry picked from commit
93d705b6d742e8f00167ff2384e35c2205a6f9da)
Such option is useful when debugging dumpstate itself, since it will
finish much sooner and its output will be much smaller.
Change-Id: If821ed21715461bf82eea0b2be4b926239ad69da
John Reck [Sat, 6 Feb 2016 00:14:35 +0000 (00:14 +0000)]
Merge "Enable wildcard in the list of kernel functions"
am:
fda23631b9
* commit '
fda23631b978bec793b67037dc2841a6a15531fb':
Enable wildcard in the list of kernel functions
John Reck [Sat, 6 Feb 2016 00:11:38 +0000 (00:11 +0000)]
Merge "Enable wildcard in the list of kernel functions"
Mark Salyzyn [Fri, 5 Feb 2016 22:41:30 +0000 (22:41 +0000)]
Merge "dumpstate: refine calculated eMMC performance values"
am:
088e7586ea
* commit '
088e7586ea7d0103d1b5395172a4594eddbf5b4a':
dumpstate: refine calculated eMMC performance values
Mark Salyzyn [Fri, 5 Feb 2016 22:38:34 +0000 (22:38 +0000)]
Merge "dumpstate: refine calculated eMMC performance values"
Mark Salyzyn [Thu, 4 Feb 2016 17:20:44 +0000 (09:20 -0800)]
dumpstate: refine calculated eMMC performance values
Correct the raw performance with the average queue depth. Add a
report for I/O per second, and the average queue depth. Round
values up.
Bug:
26966375
Change-Id: I2a8d233872d5e5ff79d433abba3c34d5945701f4
Christopher Wiley [Fri, 5 Feb 2016 17:08:23 +0000 (09:08 -0800)]
Don't rely on AppOpsManager in systems without applications
Brillo has no applications, and doesn't run AppOpsManager. Instead,
services are granted statically configured SELinux permissions at
build time. Rely on that configuration rather than Android's
dynamically configurable permission model.
Bug:
26936651
Test: Test code on Brillo system is able to connect to the camera.
Change-Id: I84b72a762c2f534c2e1cc6f99ef2003388fb1265
Mark Salyzyn [Fri, 5 Feb 2016 18:08:36 +0000 (18:08 +0000)]
Merge "system_server BINDER_TYPE_FD driver ashmem accessors"
am:
b23a388c64
* commit '
b23a388c64d2fef51482feaaf89c345488f3cabc':
system_server BINDER_TYPE_FD driver ashmem accessors
Mark Salyzyn [Fri, 5 Feb 2016 18:05:23 +0000 (18:05 +0000)]
Merge "system_server BINDER_TYPE_FD driver ashmem accessors"
Christopher Wiley [Fri, 5 Feb 2016 17:06:30 +0000 (09:06 -0800)]
Fix race in AppOpsManager client library
If the service stays down for more than 10 seconds, client threads
will time out attempting to obtain a reference, and never release
the mutex. This causes deadlock on the next attempt to speak
with the AppOpsManager.
Test: System without AppOpsManager service no longer hangs in camera
code.
Change-Id: I5a8ac2f0f35345f72c3d2a45b9d1fc5a78d28a51
Thomas Buhot [Wed, 27 Jan 2016 08:44:31 +0000 (09:44 +0100)]
Enable wildcard in the list of kernel functions
The handling of the -k option is too restrictive
as it stricly checks the names of the kernel functions
after it wrote them in /d/tracing/set_ftrace_filter.
However, a common usage of that function filtering with ftrace
is to use a wildcard character (*) that the ftrace tracer
automatically expands to all the matching kernel functions.
This enables the support of the wildcard (*) character
in the -k option to trace kernel functions.
Change-Id: Ifffae975c20e1c253157a3a6b44a14b4f342b9d0
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Eino-Ville Talvala [Fri, 5 Feb 2016 00:54:57 +0000 (00:54 +0000)]
Merge "Binder::Status: Add operator<< to help with gtest logging"
am:
259eb56171
* commit '
259eb56171420f62be325eadc38673d967527ab6':
Binder::Status: Add operator<< to help with gtest logging
Eino-Ville Talvala [Fri, 5 Feb 2016 00:52:11 +0000 (00:52 +0000)]
Merge "Binder::Status: Add operator<< to help with gtest logging"
Eino-Ville Talvala [Wed, 3 Feb 2016 21:19:49 +0000 (13:19 -0800)]
Binder::Status: Add operator<< to help with gtest logging
Change-Id: I22fcf7c6314451701ba947af2d69d4e45b22345a
Mark Salyzyn [Tue, 2 Feb 2016 18:27:03 +0000 (10:27 -0800)]
system_server BINDER_TYPE_FD driver ashmem accessors
check if device matches the ashmem rdev, before calling
ashmem_get_size_region. This eliminates making this call
when associated with other driver file descriptors.
Bug:
26374183
Bug:
26918423
Bug:
26871259
Change-Id: I1f88c2c93ea35a73c8e14125f3d1a6c67fa4f15b
Dan Albert [Wed, 3 Feb 2016 01:20:13 +0000 (01:20 +0000)]
Merge "Fix typo from last commit."
am:
ae8442856b
* commit '
ae8442856bfdcfd4daf287a880ce7ce4eadaa3e4':
Fix typo from last commit.
Dan Albert [Wed, 3 Feb 2016 01:16:40 +0000 (01:16 +0000)]
Merge "Fix typo from last commit."
Dan Albert [Wed, 3 Feb 2016 01:08:05 +0000 (17:08 -0800)]
Fix typo from last commit.
Bad commit: https://android-review.googlesource.com/#/c/200449/1
Change-Id: I412e2740951f15cf843bd36a50476070c0cb1ebd
Dan Albert [Wed, 3 Feb 2016 00:43:16 +0000 (00:43 +0000)]
Merge "Clean up warnings in inputflinger."
am:
f3606ef25f
* commit '
f3606ef25fb588283020c4df178076852eecc4e3':
Clean up warnings in inputflinger.
Dan Albert [Wed, 3 Feb 2016 00:43:10 +0000 (00:43 +0000)]
Merge "Clean up warnings in EGL."
am:
c312141adc
* commit '
c312141adc9a5f00b5d13d0980d132d2a8c6f3c9':
Clean up warnings in EGL.
Dan Albert [Wed, 3 Feb 2016 00:40:26 +0000 (00:40 +0000)]
Merge "Clean up warnings in inputflinger."
Dan Albert [Wed, 3 Feb 2016 00:40:03 +0000 (00:40 +0000)]
Merge "Clean up warnings in EGL."
Dan Albert [Tue, 2 Feb 2016 23:11:57 +0000 (15:11 -0800)]
Clean up warnings in inputflinger.
Bug: http://b/
26936282
Change-Id: Ie1fb281425c3b8c4b3e6e88dc5722d51b77ee093
Dan Albert [Tue, 2 Feb 2016 23:08:34 +0000 (15:08 -0800)]
Clean up warnings in EGL.
Bug: http://b/
26936282
Change-Id: I059628332d638f080a5236eed62cf0afa1d4d6ba
Andreas Gampe [Mon, 1 Feb 2016 22:26:59 +0000 (22:26 +0000)]
Merge "Binder: Add log output in IPCThreadState::self()"
am:
2be113a248
* commit '
2be113a2489e7d56b21f8ec340198959348012b3':
Binder: Add log output in IPCThreadState::self()
Andreas Gampe [Mon, 1 Feb 2016 22:23:33 +0000 (22:23 +0000)]
Merge "Binder: Add log output in IPCThreadState::self()"