ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11013 commits 1 branch 0 tags 217 MiB
Commit graph

11013 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Salyzyn
f25ce3cf60 am ed3b0f8c: am c4133a6e: am fc1357cf: Merge "logd: in nonblocking read, sched_yield() synchronization" 
* commit 'ed3b0f8c9da87fef400c12040044998be0582543':
  logd: in nonblocking read, sched_yield() synchronization
 2014-09-29 22:26:44 +00:00
Andreas Gampe
3432fe1c37 am 0c3436e0: am f0699c11: am 68c19686: Merge "Fix mac build for nativebridge tests." 
* commit '0c3436e069254b11af13c4da87a72cdc343e4c7f':
  Fix mac build for nativebridge tests.
 2014-09-29 22:26:43 +00:00
Mark Salyzyn
ed3b0f8c9d am c4133a6e: am fc1357cf: Merge "logd: in nonblocking read, sched_yield() synchronization" 
* commit 'c4133a6e28e586f598e5c92f2b9e769178d92b3f':
  logd: in nonblocking read, sched_yield() synchronization
 2014-09-29 22:17:09 +00:00
Andreas Gampe
0c3436e069 am f0699c11: am 68c19686: Merge "Fix mac build for nativebridge tests." 
* commit 'f0699c11debade875e87efad27d37ddf6fa83ed6':
  Fix mac build for nativebridge tests.
 2014-09-29 22:17:08 +00: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
74903503f9 am 547a21ac: am 9c970bd9: am aa68f3e9: Merge "logd: auditd: report facility LOG_AUTH" 
* commit '547a21acd39529bdd1c7c03ce993bb23ec679f10':
  logd: auditd: report facility LOG_AUTH
 2014-09-29 20:47:42 +00:00
Ruchi Kandoi
aa1a6caf54 am aaaf9b11: am bdf11c76: healthd: Add callback for screen_on to the healthdHAL 
* commit 'aaaf9b110b2ad08ffeb67768cdec56bd517e26dd':
  healthd: Add callback for screen_on to the healthdHAL
 2014-09-29 19:44:24 +00:00
Alex Klyubin
9482d77a84 am 1028f781: am 9005ec37: am e3d3016d: Merge "Switch from using base64 BIOs to encoding funcs." 
* commit '1028f781aa3aaefc0ab53bd8038fd137135a947b':
  Switch from using base64 BIOs to encoding funcs.
 2014-09-29 19:44:18 +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
547a21acd3 am 9c970bd9: am aa68f3e9: Merge "logd: auditd: report facility LOG_AUTH" 
* commit '9c970bd926da8f71daad801de96460edb55b69c7':
  logd: auditd: report facility LOG_AUTH
 2014-09-29 05:43:43 +00: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
Ruchi Kandoi
aaaf9b110b am bdf11c76: healthd: Add callback for screen_on to the healthdHAL 
* commit 'bdf11c76a39d979abd105a4f27bc1973b88893ad':
  healthd: Add callback for screen_on to the healthdHAL
 2014-09-26 22:14:02 +00:00
Alex Klyubin
1028f781aa am 9005ec37: am e3d3016d: Merge "Switch from using base64 BIOs to encoding funcs." 
* commit '9005ec378ecd281f52945b5baca87245543bbfbf':
  Switch from using base64 BIOs to encoding funcs.
 2014-09-26 21:58:45 +00: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
Ruchi Kandoi
bdf11c76a3 healthd: Add callback for screen_on to the healthdHAL 
Adds a callback to the healthdHAL which can check for device specific
properties to decide if the screen should turn on.

Change-Id: I543e7729ecb291157df4d3be1bd718f8af01ac40
Signed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
 2014-09-26 14:37:17 -07:00
Andreas Gampe
af0f072037 am 1f20ebea: am aa1f512b: am 3496e327: Merge "LibNativeBridge: Add testing" 
* commit '1f20ebeae3b97369603ee924cd19d8fa4a60ecb5':
  LibNativeBridge: Add testing
 2014-09-26 20:18:58 +00:00
Andreas Gampe
1f20ebeae3 am aa1f512b: am 3496e327: Merge "LibNativeBridge: Add testing" 
* commit 'aa1f512b93ada06d76c5b2d2692e1a131b38bfd0':
  LibNativeBridge: Add testing
 2014-09-26 20:14:14 +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
60dcea1190 am 31171b6e: am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport." 
* commit '31171b6e3155ac075a37aeb28da1a06faeb15276':
  Don't manually link stlport.
 2014-09-26 19:57:59 +00:00
Dan Albert
31171b6e31 am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport." 
* commit 'be0d295da912076239a1e112c4b7b94be10cf7af':
  Don't manually link stlport.
 2014-09-26 19:53:04 +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
63f7052122 am a8996fdd: am 2d687fe3: am 9f93e297: Merge "LibNativeBridge: Fix two bugs" 
* commit 'a8996fddaa06aa9294be345f41e0955f2f7c745f':
  LibNativeBridge: Fix two bugs
 2014-09-26 15:28:56 +00:00
Andreas Gampe
91082fea6f am 7aede64a: (-s ours) am ea52030b: (-s ours) am 8dd3ea58: Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev 
* commit '7aede64a0a5963611a888820b273dd6c60c305cd':
  Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
 2014-09-26 15:26:54 +00:00
Hochi Huang
7b5cce2b23 am 54d5b2e6: am fcbb23ad: [AU] Update volume setting and Audio Device API 3.0 
* commit '54d5b2e6700e4eac29d94a24acd854fabc96bddc':
  [AU] Update volume setting and Audio Device API 3.0
 2014-09-26 15:24:23 +00:00
Jeff Sharkey
33218c3e31 am 0a0689ab: am 9b789d7a: am 2b16bf88: Merge "Include reason when wiping data." into lmp-dev 
* commit '0a0689ab85f8939bf126a969e1ef0b9b22272667':
  Include reason when wiping data.
 2014-09-26 15:24:22 +00: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
a8996fddaa am 2d687fe3: am 9f93e297: Merge "LibNativeBridge: Fix two bugs" 
* commit '2d687fe3d8af29e79ee13e5d6c3d71113d6f575a':
  LibNativeBridge: Fix two bugs
 2014-09-26 05:14:13 +00: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
Andreas Gampe
9f93e297ee Merge "LibNativeBridge: Fix two bugs" 2014-09-26 04:47:10 +00:00
Andreas Gampe
2f71cb24fa LibNativeBridge: Fix two bugs 
Instruction set comparison must include the termination character
so that prefixes are not identified as equal.

Mount argument order was wrong.

Change-Id: Ib70e36ce2ea5af158ebc9d7fafd00e978348d73d
 2014-09-25 21:34:25 -07:00
Andreas Gampe
7aede64a0a am ea52030b: (-s ours) am 8dd3ea58: Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev 
* commit 'ea52030bc6819c7ea6ffc921df9c3f13b7f8b94c':
  Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
 2014-09-26 00:46:12 +00:00
Hochi Huang
54d5b2e670 am fcbb23ad: [AU] Update volume setting and Audio Device API 3.0 
* commit 'fcbb23adc939dd27122d962e5f7e7f016259f03e':
  [AU] Update volume setting and Audio Device API 3.0
 2014-09-26 00:24:11 +00:00
Jeff Sharkey
0a0689ab85 am 9b789d7a: am 2b16bf88: Merge "Include reason when wiping data." into lmp-dev 
* commit '9b789d7a30ba3c7f4fd41e3e99c827feb80b0fb3':
  Include reason when wiping data.
 2014-09-26 00:21:53 +00:00
Dan Albert
628e4b767f am 0df62a7e: am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2)."" 
* commit '0df62a7e1511667043ced8f57b2dab072fb88dd5':
  Revert "Switch adb to epoll(2)."
 2014-09-25 22:44:16 +00:00
Dan Albert
0df62a7e15 am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2)."" 
* commit '8e1e54154bc7a5e9dee206735474186c2276b111':
  Revert "Switch adb to epoll(2)."
 2014-09-25 22:32:26 +00:00
Dan Albert
8e1e54154b am 5b4a1767: Merge "Revert "Switch adb to epoll(2)."" 
* commit '5b4a1767f6e4802c99071305e5b69b1ed22ad292':
  Revert "Switch adb to epoll(2)."
 2014-09-25 22:26:16 +00:00
Dan Albert
5b4a1767f6 Merge "Revert "Switch adb to epoll(2)."" 2014-09-25 22:17:13 +00:00
Dan Albert
45741ae2ea Revert "Switch adb to epoll(2)." 
This reverts commit 67de1557b0.
 2014-09-25 15:10:34 -07:00
Andreas Gampe
ea52030bc6 am 8dd3ea58: Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev 
* commit '8dd3ea58fdd99912f631156c37bcb2555ce8aec3':
  Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
 2014-09-25 22:02:24 +00:00
Andreas Gampe
8dd3ea58fd Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev 2014-09-25 21:55:34 +00:00