Commit graph

8569 commits

Author SHA1 Message Date
Riley Andrews
e7502d32cf am 3bcd5694: Merge "Add gtest conformance tests for libsync."
* commit '3bcd569490bceb2c1f2bdd8d6852680e12dedc9f':
  Add gtest conformance tests for libsync.
2014-10-11 19:44:46 +00:00
Riley Andrews
3bcd569490 Merge "Add gtest conformance tests for libsync." 2014-10-11 19:40:32 +00:00
Riley Andrews
d0d7f6ac08 Add gtest conformance tests for libsync.
Not complete yet, but substantially more comprehensive than the
interactive test that was there before.

(cherry-picked from internal master, same change-id).
Change-Id: I9019b0a8babbc91f78aa850e0e288bbf05f93500
2014-10-11 02:10:23 +00:00
Mark Salyzyn
af191cd157 am 6b66025f: Merge "fs_mgr: fix build breakage"
* commit '6b66025f6f3e48d182e8d6aeb989d0f39eb551e3':
  fs_mgr: fix build breakage
2014-10-09 14:20:05 +00:00
Mark Salyzyn
6b66025f6f Merge "fs_mgr: fix build breakage" 2014-10-09 14:14:55 +00:00
Mark Salyzyn
89fa114e2a fs_mgr: fix build breakage
Some compilers are not as smart as other compilers

Change-Id: I9d93c73bdbd2dca37373d8a42a2ed510d0559274
2014-10-08 16:43:47 -07:00
Elliott Hughes
f7c287b750 am 47d24416: Merge "Fix top for very large VSS."
* commit '47d244165751f0fa03e63a8b7aa44b50c5f3bf88':
  Fix top for very large VSS.
2014-10-08 18:24:13 +00:00
Elliott Hughes
47d2441657 Merge "Fix top for very large VSS." 2014-10-08 18:20:31 +00:00
Elliott Hughes
052d78f334 Fix top for very large VSS.
Bug: 17913995
Change-Id: Ib8359345f3194780ae50019292c2746eb21a7612
2014-10-08 11:20:03 -07:00
Mark Salyzyn
b2a5d839ec am a083c857: Merge changes I7d0b85b5,I74796043
* commit 'a083c8578a8cfa44b50e6d1159b83182aba63bcb':
  logd: LogStatistics leak
  logd: kill(0,0) issue
2014-10-07 14:27:06 +00:00
Mark Salyzyn
a083c8578a Merge changes I7d0b85b5,I74796043
* changes:
  logd: LogStatistics leak
  logd: kill(0,0) issue
2014-10-07 14:23:46 +00:00
Mark Salyzyn
332bdffa4f am 09dc0633: Merge changes I74796043,I74796043
* commit '09dc063319d017625fbde0fd380ed677b680415e':
  logd: Add control statistics enable/disable.
  logd: cleanup
2014-10-06 23:06:50 +00:00
Mark Salyzyn
f48ea7c8dc logd: LogStatistics leak
- uid = -1 in subtract operation to match add

Change-Id: I7d0b85b5334c5264fd04309cb78e0c9aec0ad261
2014-10-06 22:43:56 +00:00
Mark Salyzyn
df5aa61f05 logd: kill(0,0) issue
- Recognize pid=0 as special case (kernel or pre-init sourced)
  and refrain from treating it in the general case.

Bug: 17526159
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e012
2014-10-06 22:43:46 +00:00
Mark Salyzyn
09dc063319 Merge changes I74796043,I74796043
* changes:
  logd: Add control statistics enable/disable.
  logd: cleanup
2014-10-06 22:43:26 +00:00
Mark Salyzyn
f5fc509589 logd: Add control statistics enable/disable.
- ro.build.type=user turn off statistics
- ro.config.low_ram=true turn off statistics
- logd.statistics override

Bug: 17526159
Bug: 17526187
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e00f
2014-10-06 22:42:47 +00:00
Mark Salyzyn
e72c6e4366 logd: cleanup
- simplify access and control exposure to class list
- indent
- compile warning
- Follow standard naming convention for variables and methods
- merge common fragments
- Side Effects: none

Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e010
2014-10-06 22:42:07 +00:00
Chih-Hung Hsieh
ad0ff1d99c am 4fceda2b: Merge "Add -no-integrated-as at local level."
* commit '4fceda2b53dd2b7537bb65cb6ee0d61bee5ab66c':
  Add -no-integrated-as at local level.
2014-10-06 22:31:26 +00:00
Chih-Hung Hsieh
4fceda2b53 Merge "Add -no-integrated-as at local level." 2014-10-06 22:02:06 +00:00
Chih-Hung Hsieh
60c57dad4e Add -no-integrated-as at local level.
Later we will enable integrated-as as default at the global level.

BUG: 17820427
Change-Id: I1beed3e75d074d970fa9112ec1c0f0df3d43947a
2014-10-06 13:33:25 -07:00
Elliott Hughes
85cac2abd4 am b1dd4af7: Merge "Fix a typo in ioctl usage message."
* commit 'b1dd4af7c41dc0d73f9431ec7adabc342e13434e':
  Fix a typo in ioctl usage message.
2014-10-06 17:16:04 +00:00
Elliott Hughes
b1dd4af7c4 Merge "Fix a typo in ioctl usage message." 2014-10-06 17:12:01 +00:00
Elliott Hughes
a0d61ba3e9 Fix a typo in ioctl usage message.
Change-Id: I850dd9995a8ad6cb1f606cca2f57d7dbba2f40ed
2014-10-06 10:09:25 -07:00
Hans Boehm
072877af48 am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '41198eea42b7a6f1d4222abd7a5fec965d11b238':
  Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 01:36:18 +00:00
Hans Boehm
41198eea42 Merge "Revert "Rewrite atomic.h to use stdatomic.h."" 2014-10-04 01:31:49 +00:00
Hans Boehm
2789faabfa Revert "Rewrite atomic.h to use stdatomic.h."
This reverts commit cb344d4640.

Change-Id: Ib17cd8d00695062177ce863cedc4ec7148012317
2014-10-04 00:49:06 +00:00
Hans Boehm
f5204549fa am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit '028928fe3ca42b7aab55cb49f2784caeec025a12':
  Rewrite atomic.h to use stdatomic.h.
2014-10-03 23:59:04 +00:00
Hans Boehm
028928fe3c Merge "Rewrite atomic.h to use stdatomic.h." 2014-10-03 23:47:36 +00:00
Calin Juravle
2124b521e8 am c6083626: Merge "Use initUnchangeableSystemProperty for initializing os.arch."
* commit 'c60836263e19ac15f674320e978caa577c042f12':
  Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-02 17:38:03 +00:00
Calin Juravle
c60836263e Merge "Use initUnchangeableSystemProperty for initializing os.arch." 2014-10-02 17:28:39 +00:00
Hans Boehm
cb344d4640 Rewrite atomic.h to use stdatomic.h.
Replace atomic-inl.h with a file that just includes atomic.h.
Remove platform specific implementations.

Change-Id: If16d74fbe0af7836ed8c1296c17e13a2d0d20f64
2014-10-01 17:37:20 -07:00
Calin Juravle
c3eb4314b7 Use initUnchangeableSystemProperty for initializing os.arch.
Bug: 17713104

(cherry picked from commit 00851a53be)

Change-Id: Ibddc535248a10e3534586eafb76c074332e025c4
2014-10-01 21:16:16 +01:00
Mark Salyzyn
c4133a6e28 am fc1357cf: Merge "logd: in nonblocking read, sched_yield() synchronization"
* commit 'fc1357cffbbe999c8d4065b89ce0435f35243a82':
  logd: in nonblocking read, sched_yield() synchronization
2014-09-29 20:48:05 +00:00
Andreas Gampe
f0699c11de am 68c19686: Merge "Fix mac build for nativebridge tests."
* commit '68c19686e8f9b5a88e3b2729a453d03516be79f1':
  Fix mac build for nativebridge tests.
2014-09-29 20:48:04 +00:00
Mark Salyzyn
fc1357cffb Merge "logd: in nonblocking read, sched_yield() synchronization" 2014-09-29 17:41:11 +00:00
Mark Salyzyn
f669acb018 logd: in nonblocking read, sched_yield() synchronization
- sched_yield and lock synchronization in reader thread
  startup to give writer thread a chance to catch up

Bug: 17512203
Change-Id: I43cf0b4e2829b22b3ab4e537fa95ce13c76a869c
2014-09-29 17:40:10 +00:00
Andreas Gampe
68c19686e8 Merge "Fix mac build for nativebridge tests." 2014-09-29 14:59:50 +00:00
Calin Juravle
c00994df05 Fix mac build for nativebridge tests.
Bug: 17671501

(cherry picked from commit 2e5e8cc92081da6b0af658d12a60334acea441a1)

Change-Id: Id0d729a25a5cea2fed5005cdea750e9e94f46d21
2014-09-29 07:58:15 -07:00
Mark Salyzyn
9c970bd926 am aa68f3e9: Merge "logd: auditd: report facility LOG_AUTH"
* commit 'aa68f3e9dd673fee8a96c80b9f4bb816cd42e680':
  logd: auditd: report facility LOG_AUTH
2014-09-29 00:00:08 +00:00
Mark Salyzyn
aa68f3e9dd Merge "logd: auditd: report facility LOG_AUTH" 2014-09-28 22:41:29 +00:00
Mark Salyzyn
7ee2aef8e0 logd: auditd: report facility LOG_AUTH
Change-Id: Ie325e1b58f52b6c728d5cfd6f6b87287fcf32e10
2014-09-28 14:42:05 -07:00
Alex Klyubin
9005ec378e am e3d3016d: Merge "Switch from using base64 BIOs to encoding funcs."
* commit 'e3d3016d46f53a75d4ae94fcbcb95a5593eb00a0':
  Switch from using base64 BIOs to encoding funcs.
2014-09-26 21:54:37 +00:00
Alex Klyubin
e3d3016d46 Merge "Switch from using base64 BIOs to encoding funcs." 2014-09-26 21:51:36 +00:00
Andreas Gampe
aa1f512b93 am 3496e327: Merge "LibNativeBridge: Add testing"
* commit '3496e327ae49ac3ac537009aa70dd884b322d971':
  LibNativeBridge: Add testing
2014-09-26 20:10:06 +00:00
Andreas Gampe
3496e327ae Merge "LibNativeBridge: Add testing" 2014-09-26 19:59:37 +00:00
Dan Albert
be0d295da9 am 19d686ee: Merge "Don\'t manually link stlport."
* commit '19d686ee9340c81c23083fc30bc012f7f6ed5028':
  Don't manually link stlport.
2014-09-26 19:45:28 +00:00
Dan Albert
19d686ee93 Merge "Don't manually link stlport." 2014-09-26 19:39:44 +00:00
Dan Albert
b50af2bc60 Don't manually link stlport.
Change-Id: I60d2bc868fb9052f120103e9675046ef54f510d0
2014-09-26 10:37:30 -07:00
Andreas Gampe
04054e28e2 LibNativeBridge: Add testing
Change PreInitializeNativeBridge to have a different path for
the host to allow testing. Add a test (needs root privileges).

Add a test for NeedsNativeBridge.

Change error reporting to use strerror.

Change-Id: Id2d488f0484ff8b0438863b48ef43770e784505f
2014-09-25 23:18:31 -07:00
Andreas Gampe
2d687fe3d8 am 9f93e297: Merge "LibNativeBridge: Fix two bugs"
* commit '9f93e297ee7df04bf605b9dc1251f7c772c48189':
  LibNativeBridge: Fix two bugs
2014-09-26 04:59:17 +00:00