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

8108 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeff Sharkey
36fb5fed1f Merge "Add "import" support to system property files." 2014-03-19 20:18:01 +00:00
Jeff Sharkey
f96b044551 Add "import" support to system property files. 
During boot, allow a property file to import properties from another
file.  Supports importing the entire file, a specific key, or any
keys matching a specific prefix.  Here's some example syntax:

import /oem/oem.prop
import /oem/oem.prop foo.*
import /oem/oem.prop foo.bar

Bug: 13340779
Change-Id: I867f9a10ca09684326675d9f051f5cf2ae171617
 2014-03-19 13:00:43 -07:00
Geremy Condra
8c40dc90c5 Merge changes Ibea4c13a,I27215a3d 
* changes:
  init: Add "partition.*.verified" properties to the property service.
  fs_mgr: Set the 'partition.*.verified' property for verified partitions.
 2014-03-19 19:55:07 +00:00
Geremy Condra
0621d702a1 init: Add "partition.*.verified" properties to the property service. 
These are intended to be used by the rest of the system as weak
indicators that the corresponding partition is verified. For
instance, if the "partition.system.verified" property is set then
using `adb remount` would be unwise.

These should not be used as the basis for security decisions.

Change-Id: Ibea4c13abd54f46537e2a406774412c25918b24d
 2014-03-18 20:35:15 -07:00
Geremy Condra
05699b3e3e fs_mgr: Set the 'partition.*.verified' property for verified partitions. 
This modifies fs_mgr to set the partition.*.verified properties.
Each of these should be used as a weak indicator that a given partition
is verified. For instance, if the 'partition.system.verified' property
is set to '1', this could indicate that the system partition is verified
and therefore should not be modified by, e.g., adb sync.

Note that these properties can be mutated by the system, and so
should not be used as the basis for security decisions.

Change-Id: I27215a3d3628a1b1e184df9eaad90541b9d8b841
 2014-03-18 20:35:07 -07:00
Michael Wright
4b33d3bbe0 Merge "Add traits to BitSet64, not 32." 2014-03-19 00:48:16 +00:00
Michael Wright
74e2538b48 Add traits to BitSet64, not 32. 
Change-Id: I3d41bbe47f5b02c610f69fc7824e416436d086b1
 2014-03-18 17:45:37 -07:00
Michael Wright
52a186b798 Merge "Add BitSet64" 2014-03-19 00:33:41 +00:00
Michael Wright
bab6ea0bb7 Add BitSet64 
Change-Id: Ia0039aae00316f42a8306a9fb8ad37269180b58c
 2014-03-18 17:28:22 -07:00
Mark Salyzyn
8e1943b4fc am cf4ddc77: am eb8f6b8a: am 208dae2e: Merge "logd: Logging is truncated" 
* commit 'cf4ddc77117c9ca30180c6f76e29945df4708399':
  logd: Logging is truncated
 2014-03-18 23:38:14 +00:00
Mark Salyzyn
cf4ddc7711 am eb8f6b8a: am 208dae2e: Merge "logd: Logging is truncated" 
* commit 'eb8f6b8aa595a6c8f7098c9f706aeb16cff8e716':
  logd: Logging is truncated
 2014-03-18 23:32:50 +00:00
Mark Salyzyn
eb8f6b8aa5 am 208dae2e: Merge "logd: Logging is truncated" 
* commit '208dae2ee875e6f63ffbe7f32d84b825b93890a6':
  logd: Logging is truncated
 2014-03-18 23:30:03 +00:00
Mark Salyzyn
208dae2ee8 Merge "logd: Logging is truncated" 2014-03-18 23:22:18 +00:00
Mark Salyzyn
b059cf53c9 logd: Logging is truncated 
- stack buffer undersized

Bug: 13514601
Change-Id: I3e5dda2daa7531ddcacece33dfdecaa28dcca765
 2014-03-18 16:03:34 -07:00
Mark Salyzyn
aae5d5cb30 am f8c9ccf3: am 6c0cd1dd: am 6c92369c: Merge "logcat: improve error messages" 
* commit 'f8c9ccf3bd73937be740a8ce63e7ee9a62b7c6ec':
  logcat: improve error messages
 2014-03-18 17:15:59 +00:00
Mark Salyzyn
f8c9ccf3bd am 6c0cd1dd: am 6c92369c: Merge "logcat: improve error messages" 
* commit '6c0cd1dd4a0a9093540a694a6725ce5e8fbea0e8':
  logcat: improve error messages
 2014-03-18 17:10:49 +00:00
Mark Salyzyn
6c0cd1dd4a am 6c92369c: Merge "logcat: improve error messages" 
* commit '6c92369cbea460fded7e85f9751c6938000f504a':
  logcat: improve error messages
 2014-03-18 17:06:16 +00:00
Mark Salyzyn
6c92369cbe Merge "logcat: improve error messages" 2014-03-18 16:50:14 +00:00
Mark Salyzyn
fff04e3014 logcat: improve error messages 
Bug: 13464830
Change-Id: Ia8783fa2422e444bcdfca8d0153cf6e7634612bb
 2014-03-18 09:43:03 -07:00
Doug Zongker
c5089cfc61 am 80fef2c0: am 4633073d: am 2beed941: Merge "update minui library call" 
* commit '80fef2c037b41755f3aa49bf1ff3185cb63afe4c':
  update minui library call
 2014-03-18 01:40:43 +00:00
Doug Zongker
80fef2c037 am 4633073d: am 2beed941: Merge "update minui library call" 
* commit '4633073d7c07df972e5a9618548b96129ccd5041':
  update minui library call
 2014-03-18 01:37:17 +00:00
Doug Zongker
4633073d7c am 2beed941: Merge "update minui library call" 
* commit '2beed9419443021d340690a0f36eea9baca44fec':
  update minui library call
 2014-03-18 01:34:00 +00:00
Doug Zongker
2f10b6bc23 am 706d57b2: am 769c6452: update minui library call 
* commit '706d57b2948cc2eec22dc16394cf5582586b4237':
  update minui library call
 2014-03-18 00:15:27 +00:00
Doug Zongker
706d57b294 am 769c6452: update minui library call 
* commit '769c645286436cd909371452cb7bcc2c9f77cd2a':
  update minui library call
 2014-03-18 00:11:26 +00:00
Doug Zongker
769c645286 update minui library call 
The names of the res_create_* functions have changed.

Change-Id: I9990bb4f6e6dc2d7c62e2cb9e0831532c83b2bb9
 2014-03-17 17:03:56 -07:00
Greg Hackmann
5f24f5de72 am 027987e6: am b7d18a0d: am 998e0227: Merge "liblog: improve errno handling on read failure" 
* commit '027987e64b82b76f9ca8c8679690d35938aa3537':
  liblog: improve errno handling on read failure
 2014-03-17 23:32:49 +00:00
Doug Zongker
2beed94194 Merge "update minui library call" 2014-03-17 22:56:39 +00:00
Greg Hackmann
027987e64b am b7d18a0d: am 998e0227: Merge "liblog: improve errno handling on read failure" 
* commit 'b7d18a0db1b6a8b3ea602c02dee7df0f5b3c85cc':
  liblog: improve errno handling on read failure
 2014-03-17 20:55:49 +00:00
Greg Hackmann
b7d18a0db1 am 998e0227: Merge "liblog: improve errno handling on read failure" 
* commit '998e022748876bc36905ba39e4825a4b634dc9d7':
  liblog: improve errno handling on read failure
 2014-03-17 20:51:45 +00:00
Greg Hackmann
998e022748 Merge "liblog: improve errno handling on read failure" 2014-03-17 20:45:52 +00:00
Greg Hackmann
8084a53897 liblog: improve errno handling on read failure 
1. socket() failures should skip close(), since sock is not an open fd
2. on other I/O related failures, preserve errno around the close() call
3. set errno to a meaningful value on check_log_success() failure

Change-Id: I0fb9e726ae5fee2f7b84344aa925e5159d57c360
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2014-03-17 13:16:27 -07:00
Doug Zongker
0709917e25 update minui library call 
The names of the res_create_* functions have changed.

Change-Id: I9990bb4f6e6dc2d7c62e2cb9e0831532c83b2bb9
 2014-03-17 12:23:00 -07:00
Mark Salyzyn
914eec761f am 8299ff70: Merge "init: 64-bit build issue" into klp-volantis-dev 
* commit '8299ff701b66caf513e6cc8807b413bf44b8c2f6':
  init: 64-bit build issue
 2014-03-17 15:50:22 +00:00
Mark Salyzyn
8299ff701b Merge "init: 64-bit build issue" into klp-volantis-dev 2014-03-17 15:46:19 +00:00
Mark Salyzyn
0aff05eb8c init: 64-bit build issue 
Change-Id: Icc5344abc184adf4247175d85b2da08af4636e49
 2014-03-17 08:38:37 -07:00
Brian Carlstrom
c8e20472a7 am a4961e66: am d84869fb: am a0915abd: Merge "Fix build some more" 
* commit 'a4961e66b539d69b7656d93db05371b20efc8f3b':
  Fix build some more
 2014-03-15 21:29:45 +00:00
Brian Carlstrom
a4961e66b5 am d84869fb: am a0915abd: Merge "Fix build some more" 
* commit 'd84869fbb8589430981ba19d2d1cbc9ef58b8df3':
  Fix build some more
 2014-03-15 21:26:33 +00:00
Brian Carlstrom
d84869fbb8 am a0915abd: Merge "Fix build some more" 
* commit 'a0915abd2fb57113bc46e8d8fe5013ca4a9ef6e8':
  Fix build some more
 2014-03-15 21:24:38 +00:00
Brian Carlstrom
a0915abd2f Merge "Fix build some more" 2014-03-15 21:19:28 +00:00
Christopher Tate
5a6b8d15ea Fix build some more 
Missed one.

(cherry picked from commit f7f080ce62)

Change-Id: I33bf8bcc651330b9bc434da02c47c29bc0d54369
 2014-03-15 14:16:26 -07:00
Brian Carlstrom
287b32b7f0 am ccd830ad: am 1ba8eb6b: am 8e012107: Merge "Fix the build" 
* commit 'ccd830adad7c1723331b6f3d2122b910088dd377':
  Fix the build
 2014-03-15 21:07:40 +00:00
Brian Carlstrom
ccd830adad am 1ba8eb6b: am 8e012107: Merge "Fix the build" 
* commit '1ba8eb6bf8efb4bd3c2bec6ff8ffd8ae6ee91ac8':
  Fix the build
 2014-03-15 21:05:51 +00:00
Brian Carlstrom
1ba8eb6bf8 am 8e012107: Merge "Fix the build" 
* commit '8e01210767493ceb8f264c1bef7a635f0aa32222':
  Fix the build
 2014-03-15 21:03:18 +00:00
Brian Carlstrom
8e01210767 Merge "Fix the build" 2014-03-15 20:59:19 +00:00
Christopher Tate
dc507769b5 Fix the build 
(cherry-picked from commit 296dc44637)

Change-Id: I924f4796fbb70a0f45cc23a852e26e634c5b0e0e
 2014-03-15 13:57:34 -07:00
Mark Salyzyn
a0934327c2 am 22377569: am 092e3d55: am 7ad09634: Merge "libziparchive: 64 bit compile issues" 
* commit '22377569bbac6621a47a478856799588c5f5a3b6':
  libziparchive: 64 bit compile issues
 2014-03-15 00:30:46 +00:00
Mark Salyzyn
22377569bb am 092e3d55: am 7ad09634: Merge "libziparchive: 64 bit compile issues" 
* commit '092e3d5537996d1fb0af715cceb95fd28026025e':
  libziparchive: 64 bit compile issues
 2014-03-14 23:41:59 +00:00
Mark Salyzyn
092e3d5537 am 7ad09634: Merge "libziparchive: 64 bit compile issues" 
* commit '7ad096340fd5170267b12a6bd577e9d30353564f':
  libziparchive: 64 bit compile issues
 2014-03-14 23:36:59 +00:00
Mark Salyzyn
7ad096340f Merge "libziparchive: 64 bit compile issues" 2014-03-14 23:30:40 +00:00
Christopher Tate
f7f080ce62 Fix build some more 
Missed one.

Change-Id: Ic014efd927beb2df63657951e6b0f15d94e927f8
 2014-03-14 14:59:53 -07:00