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

5445 commits

This branch
This branch
All branches
Author SHA1 Message Date
Geremy Condra
dbdd280ea6 Merge "Add logic to fixup file contexts after a policy update." 2013-04-15 21:34:07 +00:00
Geremy Condra
47677a506f Add logic to fixup file contexts after a policy update. 
Bug: 8116902
Change-Id: Ifa1785c75a24a9b3cfcb700f22ded7d16a917f79
 2013-04-15 13:16:38 -07:00
Ken Sumrall
000f5cf7c6 am 6673886d: am ebbe9807: Include liblog in fs_mgr to fix the build. 
* commit '6673886d4a9166608fa152e2c922fe3b6022273a':
  Include liblog in fs_mgr to fix the build.
 2013-04-15 13:12:05 -07:00
Ken Sumrall
6673886d4a am ebbe9807: Include liblog in fs_mgr to fix the build. 
* commit 'ebbe9807906dad946659b6e9f849030eaa87731b':
  Include liblog in fs_mgr to fix the build.
 2013-04-15 13:08:05 -07:00
Ken Sumrall
ebbe980790 Include liblog in fs_mgr to fix the build. 
A recent change to how libcutils is built requires liblog
to be explicitly included in the link list if it's needed.

Change-Id: I8547f5e65c488c8f6e314ccd4eb96606742272be
 2013-04-15 12:33:17 -07:00
The Android Open Source Project
81099a92b9 am 160a22b8: Reconcile with jb-mr2-release - do not merge 
* commit '160a22b8fbc2c25cb893e92fcad2db8fc26e24b2':
 2013-04-15 10:53:13 -07:00
The Android Open Source Project
160a22b8fb Reconcile with jb-mr2-release - do not merge 
Change-Id: I5bcebe96be1d96d4e9f694eef967ca076310cfa1
 2013-04-15 10:46:31 -07:00
Ken Sumrall
ea4b3867c4 am d45dcbd5: am 1a6d9ec2: Merge "fs_mgr: Capture the output of e2fsck and add to the kernel log" into jb-mr2-dev 
* commit 'd45dcbd5f825dfde943791c1fb5eaa27e1fc02f5':
  fs_mgr: Capture the output of e2fsck and add to the kernel log
 2013-04-15 10:38:51 -07:00
Ken Sumrall
d6590f00aa am 23d1a02f: am 1f75eb1e: Merge "logwrapper: Add ability to log to kernel log" into jb-mr2-dev 
* commit '23d1a02f7cf60bf1db70f5580c77a27ac4dfd29d':
  logwrapper: Add ability to log to kernel log
 2013-04-15 10:38:50 -07:00
Ken Sumrall
cb1300a255 am 3b051178: am 774814d1: Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-dev 
* commit '3b0511788c86968860a682b6652c26c4415fa222':
  klog: Have klog_write() call klog_init() if needed
 2013-04-15 10:38:50 -07:00
Ken Sumrall
d45dcbd5f8 am 1a6d9ec2: Merge "fs_mgr: Capture the output of e2fsck and add to the kernel log" into jb-mr2-dev 
* commit '1a6d9ec2af7b3151c64a167162c87d258d30735b':
  fs_mgr: Capture the output of e2fsck and add to the kernel log
 2013-04-15 10:35:32 -07:00
Ken Sumrall
23d1a02f7c am 1f75eb1e: Merge "logwrapper: Add ability to log to kernel log" into jb-mr2-dev 
* commit '1f75eb1eae4dde3e7d8c625fca3063cf5a488079':
  logwrapper: Add ability to log to kernel log
 2013-04-15 10:35:32 -07:00
Ken Sumrall
3b0511788c am 774814d1: Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-dev 
* commit '774814d1940a87175fc7dc692fef5c626d893968':
  klog: Have klog_write() call klog_init() if needed
 2013-04-15 10:35:31 -07:00
Ken Sumrall
1a6d9ec2af Merge "fs_mgr: Capture the output of e2fsck and add to the kernel log" into jb-mr2-dev 2013-04-15 17:34:15 +00:00
Ken Sumrall
1f75eb1eae Merge "logwrapper: Add ability to log to kernel log" into jb-mr2-dev 2013-04-15 17:33:44 +00:00
Ken Sumrall
774814d194 Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-dev 2013-04-15 17:33:27 +00:00
The Android Automerger
d8c0d8dcbd merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-15 05:56:35 -07:00
Ken Sumrall
bf021b4cd7 fs_mgr: Capture the output of e2fsck and add to the kernel log 
Currently, the output of e2fsck is not saved, and we have no insight
into how many errors e2fsck is finding and fixing.  Using the new
abbreviated logging feature in liblogwrap, up to the first 100 lines,
and last 4K bytes of the output of e2fsck is captured by fs_mgr, and
added to the kernel log.

Usually, the filesystem will be clean, and this will only add a few
lines to the kernel log on boot, but when things go wrong, it should
save enough to indicate what the problem is, without potentially
filling the kernel log with only e2fsck output if the filesystem is
really corrupted.

Change-Id: I9c264798e6fe721c8f818b5ce15d0975027ddbdd
 2013-04-14 17:11:00 -07:00
Ken Sumrall
96e11b5bc4 logwrapper: Add ability to log to kernel log 
Also add ability to do abbreviated logging where only the first
4K bytes and last 4K bytes of output are added to the desginated log.

Also update standalog logwrapper command to support the new options.

Change-Id: Ia49cbe58479b9f9ed077498d6852e20b21287bad
 2013-04-14 17:10:55 -07:00
Dianne Hackborn
9bd89925ef am c08b50df: am 24bc41b7: Add new resources trace. 
* commit 'c08b50dfc68504b692c13194e86d33328d373019':
  Add new resources trace.
 2013-04-12 17:03:06 -07:00
Dianne Hackborn
c08b50dfc6 am 24bc41b7: Add new resources trace. 
* commit '24bc41b78ca004ac7a6873054ff919da1ba9a6f8':
  Add new resources trace.
 2013-04-12 16:59:37 -07:00
Dianne Hackborn
24bc41b78c Add new resources trace. 
Change-Id: I63398f282fe7bf04f1c4cefa8f602100f403fa7c
 2013-04-12 14:51:43 -07:00
Ken Sumrall
7425fd1b23 klog: Have klog_write() call klog_init() if needed 
Also change klog_init() to do nothing if already initialized.

Change-Id: Ia2dfe914c9d9fd119fb8939508d57b15c9884663
 2013-04-11 20:03:47 -07:00
Ying Wang
a14d6fda71 am 821620f5: am c796ed97: We need libcutils to include liblog 
* commit '821620f593bef6c9765fe6ee2973b0b8df0f2d40':
  We need libcutils to include liblog
 2013-04-11 15:59:22 -07:00
Ying Wang
821620f593 am c796ed97: We need libcutils to include liblog 
* commit 'c796ed97466510dd5239008554decbe72825e19c':
  We need libcutils to include liblog
 2013-04-11 15:57:35 -07:00
Doug Zongker
bc7494fb7e Merge "mincrypt: merge the two RSA verifiers" 2013-04-11 22:02:36 +00:00
Doug Zongker
fead1c0acd Merge "mincrypt: support SHA-256 hash algorithm" 2013-04-11 22:02:28 +00:00
Doug Zongker
8fdbf97652 mincrypt: merge the two RSA verifiers 
The e=3 and e=65537 implementations are nearly identical, refactor
them down into one.

Change-Id: I537a368a6cc195f373b9354d7472957fd683beea
 2013-04-11 12:55:43 -07:00
Ying Wang
c796ed9746 We need libcutils to include liblog 
For some prebuilts were built against libcutils with liblog in it.
Unfortunately that means in the future if someone checks in prebuilts
that are built against libcutils and they don't explicitly link against
liblog, they will again prevent us from removing liblog from libcutils.

Bug: 8587800
Bug: 8580410
Change-Id: I2a5ed6233df7e7d542d1e4167bec405750c0e671
 2013-04-10 17:33:48 -07:00
Doug Zongker
515e1639ef mincrypt: support SHA-256 hash algorithm 
- adds a library to compute the SHA-256 hash

- updates the RSA verifier to take an argument specifying either SHA-1
  or SHA-256

- updates DumpPublicKey to with new "key" version numbers for
  specifying SHA-256

- adds new argument to adb auth code to maintain existing behavior

Change-Id: I5b1406cf57c2b8993f6032eda3e29139f7740839
 2013-04-10 14:33:31 -07:00
The Android Open Source Project
bf6c100a8c am cdbddac7: Reconcile with jb-mr2-release - do not merge 
* commit 'cdbddac7b62c78a998ffce85f6a0e9b2209421f2':
 2013-04-10 10:08:31 -07:00
The Android Open Source Project
cdbddac7b6 Reconcile with jb-mr2-release - do not merge 
Change-Id: I4e13e11a8c42a8b316f60e9d37170e4787643099
 2013-04-10 10:06:09 -07:00
The Android Automerger
2c61db947a merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-10 05:56:59 -07:00
Ying Wang
39f6dd65f9 am 129b6d90: am 083b5ccb: Add liblog 
* commit '129b6d907b3c32a0f0a2e4fc585502484d47a1e4':
  Add liblog
 2013-04-09 23:25:24 -07:00
Ying Wang
129b6d907b am 083b5ccb: Add liblog 
* commit '083b5ccba345ed2b4950454f16bd89c5d86b6b27':
  Add liblog
 2013-04-09 22:29:03 -07:00
Ying Wang
083b5ccba3 Add liblog 
Bug: 8580410
Change-Id: Iab3a9b4307f207c14a04a922cc7350c54e60e9ad
 2013-04-09 22:03:45 -07:00
The Android Open Source Project
5cad711976 am 2e1be175: Reconcile with jb-mr2-release - do not merge 
* commit '2e1be1756081ef7300c42f2e7906c316539d7930':
 2013-04-08 13:40:28 -07:00
The Android Open Source Project
2e1be17560 Reconcile with jb-mr2-release - do not merge 
Change-Id: I4d242b2cbadf2c9bcdeeff721a83528cd02b3c0e
 2013-04-08 13:36:44 -07:00
The Android Automerger
1520fb4fa2 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-08 05:57:16 -07:00
Colin Cross
7066da4ea9 am dd0a6cdf: am 578b7473: Merge "libsparse: Fix null pointer issue" 
* commit 'dd0a6cdf1f88fcbe16070f678911702c81c4fd4a':
  libsparse: Fix null pointer issue
 2013-04-06 12:56:31 -07:00
Colin Cross
58b0642abb am d3859e43: am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" 
* commit 'd3859e433d5a4e0da3f24851c5f5f6c9c8b97849':
  toolbox/dmesg: do not hardcode KLOG_BUF_LEN
 2013-04-06 12:56:31 -07:00
Colin Cross
dd0a6cdf1f am 578b7473: Merge "libsparse: Fix null pointer issue" 
* commit '578b74734c1cfc773f3213a23a7195aa4b5b97aa':
  libsparse: Fix null pointer issue
 2013-04-06 12:51:36 -07:00
Colin Cross
d3859e433d am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" 
* commit '6e0b9ecb503b5611d815214e0a134ea0b1395089':
  toolbox/dmesg: do not hardcode KLOG_BUF_LEN
 2013-04-06 12:51:35 -07:00
Colin Cross
578b74734c Merge "libsparse: Fix null pointer issue" 2013-04-06 19:03:02 +00:00
Colin Cross
6e0b9ecb50 Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" 2013-04-06 19:02:01 +00:00
Colin Cross
3be5c95d5f am a5ca229a: am 1615c09a: Merge "init: Fix potential null pointer issue" 
* commit 'a5ca229a4571f6df42c96e760257b7ca95c7fdeb':
  init: Fix potential null pointer issue
 2013-04-05 19:58:39 -07:00
Colin Cross
a5ca229a45 am 1615c09a: Merge "init: Fix potential null pointer issue" 
* commit '1615c09ac1065104f56ddc444f5467aff76c0daa':
  init: Fix potential null pointer issue
 2013-04-05 19:56:27 -07:00
Colin Cross
1615c09ac1 Merge "init: Fix potential null pointer issue" 2013-04-06 01:53:24 +00:00
Christopher Tate
30874aff27 am 2c170667: am 7716aef1: Uploaded native crash dumps do not include memory contents 
* commit '2c1706675dfcab3205f4e065b63a5cef8acc3668':
  Uploaded native crash dumps do not include memory contents
 2013-04-05 16:39:02 -07:00
Christopher Tate
2c1706675d am 7716aef1: Uploaded native crash dumps do not include memory contents 
* commit '7716aef138e8029357a7b3dc6a73b41f4de4b0ad':
  Uploaded native crash dumps do not include memory contents
 2013-04-05 16:35:47 -07:00