OSDN Git Service
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Change to include linux/android/binder.h."
Treehugger Robot [Wed, 20 Jul 2016 15:04:31 +0000 (15:04 +0000)]
Merge "libbinder: Tighten compiler warnings/errors"
Treehugger Robot [Tue, 19 Jul 2016 18:06:37 +0000 (18:06 +0000)]
Merge "Fix broken readNullableStrongBinder<T> implementation"
Christopher Wiley [Tue, 19 Jul 2016 16:40:13 +0000 (09:40 -0700)]
libbinder: Tighten compiler warnings/errors
Use all of -Wall -Wextra -Werror and fix the minor errors that result.
Change-Id: Id56e9c454dd3570f713d161577eed6aa8e8074aa
Christopher Wiley [Tue, 19 Jul 2016 16:23:25 +0000 (09:23 -0700)]
Fix broken readNullableStrongBinder<T> implementation
Added a missing return statement. Omitting this statement
caused the compiler to silently cast a pointer to a status_t,
which in general wasn't the expected value of OK.
Only return an error when the type casted return value is null and
the IBinder we got back was not null, indicating a type error, rather
than the expected null binder.
Bug:
30160959
Change-Id: Ief3c924b902a607335eff2fcd4d860cd8523593a
Test: Integration tests in aidl that exercise this method now pass.
Christopher Ferris [Mon, 18 Jul 2016 23:57:34 +0000 (16:57 -0700)]
Change to include linux/android/binder.h.
The upstream kernels have binder.h as linux/android/binder.h, so
match that.
Bug:
30072483
Change-Id: Iacdc96629dd09c1f4be0a5767666ab64b3df8f15
Evgenii Stepanov [Thu, 14 Jul 2016 21:39:39 +0000 (21:39 +0000)]
Merge "Workaround alloc-dealloc-mismatch error on ASan device boot."
Evgenii Stepanov [Thu, 14 Jul 2016 21:17:24 +0000 (14:17 -0700)]
Workaround alloc-dealloc-mismatch error on ASan device boot.
/proc/self/environ inaccessible in SurfaceFlinger
=> ASan fails to read ASAN_OPTIONS => alloc-dealloc-mismatch bug is not
suppressed and prevents the device from booting.
This is not perfect because, by enabling it in asan build only, the first several attempts to start
surfaceflinger fail while the /data partition is being encrypted. On the other hand, this does not affect
user builds, and device eventually gets up anyway.
BUG=b/
30067360
Change-Id: Ieaa37ff7768a11450ea33fee1f7d70a41b246c6a
Treehugger Robot [Wed, 13 Jul 2016 18:34:54 +0000 (18:34 +0000)]
Merge "[mips] Resolve issue with .align directive, when using clang IAS"
Lazar Trsic [Wed, 13 Jul 2016 12:53:07 +0000 (14:53 +0200)]
[mips] Resolve issue with .align directive, when using clang IAS
Clang IAS does not support .align without args, concrete value is needed.
Change-Id: I03a9daca0be380daa744307b3510446f8d6c9b7e
Chih-hung Hsieh [Thu, 7 Jul 2016 21:55:37 +0000 (21:55 +0000)]
Merge "Fix misc-macro-parentheses warnings in opengl."
Chih-Hung Hsieh [Wed, 29 Jun 2016 21:25:19 +0000 (14:25 -0700)]
Fix misc-macro-parentheses warnings in opengl.
Add parentheses around negative literals.
Bug:
28705665
Test: build with clang-tidy
Change-Id: I342f1d04ac08bbc28ee3ff4ebbbccbfa9f754a94
Mark Salyzyn [Fri, 24 Jun 2016 21:26:16 +0000 (21:26 +0000)]
Merge "dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG"
Mark Salyzyn [Fri, 24 Jun 2016 21:06:15 +0000 (14:06 -0700)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
Bug:
29639467
Change-Id: Iba0b1754eaebfb2b0624dcbef522b7d8456eeb50
Treehugger Robot [Wed, 15 Jun 2016 16:29:53 +0000 (16:29 +0000)]
Merge "No need for dumpstate to explicitly reference 'toybox'..."
Elliott Hughes [Tue, 14 Jun 2016 20:56:00 +0000 (13:56 -0700)]
No need for dumpstate to explicitly reference 'toybox'...
...now we've switched the symlinks over to the toybox implementations.
Change-Id: I6301e3bc8de7210bf111889ee3b014802aecf15c
Treehugger Robot [Tue, 14 Jun 2016 01:29:49 +0000 (01:29 +0000)]
Merge "Move dumpstate over to toybox top."
Elliott Hughes [Tue, 14 Jun 2016 00:35:07 +0000 (17:35 -0700)]
Move dumpstate over to toybox top.
Change-Id: I3715b0d217aaf263687d6cab24ca470caf7c70a0
Chih-hung Hsieh [Fri, 27 May 2016 17:36:55 +0000 (17:36 +0000)]
Merge "Fix misc-macro-parentheses warnings in openmax."
Treehugger Robot [Tue, 24 May 2016 18:54:40 +0000 (18:54 +0000)]
Merge "dumpstate: sscanf requires an asciiz string"
Chih-hung Hsieh [Tue, 24 May 2016 17:38:21 +0000 (17:38 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/binder."
Treehugger Robot [Fri, 20 May 2016 20:43:38 +0000 (20:43 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/gui."
Chih-hung Hsieh [Fri, 20 May 2016 20:40:52 +0000 (20:40 +0000)]
Merge "Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE."
Chih-hung Hsieh [Fri, 20 May 2016 20:40:27 +0000 (20:40 +0000)]
Merge "Fix misc-macro-parentheses warnings in test macros."
Chih-hung Hsieh [Fri, 20 May 2016 20:40:09 +0000 (20:40 +0000)]
Merge "Fix misc-macro-parentheses warnings in opengl."
Chih-Hung Hsieh [Fri, 20 May 2016 18:46:52 +0000 (11:46 -0700)]
Fix misc-macro-parentheses warnings in libs/gui.
Bug:
28705665
Change-Id: I9fcebd23e0bcf89c41cb3cbc31cae00c8e623dbd
Chih-Hung Hsieh [Fri, 20 May 2016 18:45:03 +0000 (11:45 -0700)]
Fix misc-macro-parentheses warnings in openmax.
Bug:
28705665
Change-Id: Ifda977c1754b4bc87b0fe24bf3dab6890bdf344a
Chih-Hung Hsieh [Fri, 20 May 2016 18:40:04 +0000 (11:40 -0700)]
Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE.
Bug:
28705665
Change-Id: I53ed01b67054327ad55a7e83143cc82283573fe1
Chih-Hung Hsieh [Fri, 20 May 2016 18:33:26 +0000 (11:33 -0700)]
Fix misc-macro-parentheses warnings in test macros.
Bug:
28705665
Change-Id: I6e64ccdae5869b66a3caa09d8f32b2fcc9c1b2b9
Chih-Hung Hsieh [Fri, 20 May 2016 18:30:10 +0000 (11:30 -0700)]
Fix misc-macro-parentheses warnings in libs/binder.
Bug:
28705665
Change-Id: I98a1dc5cc93e31609d3feedb6dd6a33685be69a6
Chih-Hung Hsieh [Fri, 20 May 2016 18:27:11 +0000 (11:27 -0700)]
Fix misc-macro-parentheses warnings in opengl.
Bug:
28705665
Change-Id: I761d310f0dff182c288cdbb5371272f4833aa282
Mark Salyzyn [Mon, 16 May 2016 15:33:59 +0000 (08:33 -0700)]
dumpstate: sscanf requires an asciiz string
Bug:
28770668
Change-Id: Ice56b129a243296b2691d55e8f8c35b478b1f481
Christopher Wiley [Fri, 6 May 2016 18:05:35 +0000 (18:05 +0000)]
Merge "libbinder: Use char* message with binder::Status"
Christopher Wiley [Fri, 6 May 2016 16:19:44 +0000 (09:19 -0700)]
libbinder: Use char* message with binder::Status
Bug: None
Change-Id: Idcb8345cda2bf18960c1c437b7a6de4ec17b59fe
Chih-hung Hsieh [Thu, 5 May 2016 21:19:04 +0000 (21:19 +0000)]
Merge "Fix google-explicit-constructor warnings."
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 [Tue, 3 May 2016 21:00:39 +0000 (14:00 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: Icd42a3b0043647fd4c094e8fe195ca0f94445de9
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"