Commit graph

8142 commits

Author SHA1 Message Date
Paul Lawrence
166fa3de70 Auto-encrypt drive at startup
Modify fs_mgr to unmount encryptable drives after test mounting them and
then trigger an auto-encrypt via the init script

Needs matching vold changes from
 https://googleplex-android-review.googlesource.com/#/c/414200/

Feature is limited to list of serial numbers with this change

Bug: 11985952
Change-Id: I84f85a258b6a7e9809467c9149249302e203c41b
2014-03-24 15:00:53 -07:00
Paul Lawrence
347c8de285 healthd: Add battery capacity to getProperty
Add support for BATTERY_PROP_CAPACITY property in getProperty

Bug: 11985952
Change-Id: I905cda68f990fa96138a16a11c55f2d902d0bbc1
2014-03-20 18:16:14 -07:00
Colin Cross
2eb5d85b02 resolved conflicts for merge of 9cb33f6a to master
Change-Id: I26a2c7371706917d261eae8eca5658cdc61000d7
2014-03-20 16:45:12 -07:00
JP Abgrall
f25d6bf237 am ce18445c: am ff66a068: am 4db6ce8e: Merge "Adding documentation on the sync part of the adb protocol previously missing."
* commit 'ce18445cb727c446f1d53d69cae4e0454a5d27c1':
  Adding documentation on the sync part of the adb protocol previously missing.
2014-03-20 23:39:18 +00:00
Mark Salyzyn
2583dec08c am 3f4855c1: am 46f3ebba: am 28171447: Merge "cutils: trace 64-bit compile issues"
* commit '3f4855c11889470691673c15f05361df61ea95b2':
  cutils: trace 64-bit compile issues
2014-03-20 22:27:19 +00:00
Colin Cross
9cb33f6acd am dd4720d6: am 5ad986ab: Merge "delete libnl_2"
* commit 'dd4720d65800764efdd138f8572bf2917880d9fc':
  delete libnl_2
2014-03-20 22:21:00 +00:00
JP Abgrall
ce18445cb7 am ff66a068: am 4db6ce8e: Merge "Adding documentation on the sync part of the adb protocol previously missing."
* commit 'ff66a06851828e3e5afaf14dc29526e09ca534e4':
  Adding documentation on the sync part of the adb protocol previously missing.
2014-03-20 22:17:26 +00:00
Colin Cross
dd4720d658 am 5ad986ab: Merge "delete libnl_2"
* commit '5ad986ab5690291422f86c03c3fe71a1c50faf40':
  delete libnl_2
2014-03-20 22:16:30 +00:00
JP Abgrall
ff66a06851 am 4db6ce8e: Merge "Adding documentation on the sync part of the adb protocol previously missing."
* commit '4db6ce8e353458de751394102084bb3a304a7ff6':
  Adding documentation on the sync part of the adb protocol previously missing.
2014-03-20 22:11:56 +00:00
Colin Cross
5ad986ab56 Merge "delete libnl_2" 2014-03-20 21:54:18 +00:00
JP Abgrall
4db6ce8e35 Merge "Adding documentation on the sync part of the adb protocol previously missing." 2014-03-20 21:25:42 +00:00
Alex Ray
8d0d00aad0 am c7cd0007: am 64aef64b: am 60357975: Merge "fastbootd: build static binary instead of dynamic"
* commit 'c7cd0007125a41dea218531c1b5ad377c00b65ab':
  fastbootd: build static binary instead of dynamic
2014-03-20 21:05:44 +00:00
Mark Salyzyn
3f4855c118 am 46f3ebba: am 28171447: Merge "cutils: trace 64-bit compile issues"
* commit '46f3ebba31d5820a08d0a638c9e261fbcea907a0':
  cutils: trace 64-bit compile issues
2014-03-20 20:53:25 +00:00
Mark Salyzyn
46f3ebba31 am 28171447: Merge "cutils: trace 64-bit compile issues"
* commit '28171447f8b02f85878d3f67920cf941a133c642':
  cutils: trace 64-bit compile issues
2014-03-20 20:48:52 +00:00
Mark Salyzyn
28171447f8 Merge "cutils: trace 64-bit compile issues" 2014-03-20 20:39:02 +00:00
Colin Cross
7097f052d9 delete libnl_2
libnl_2 has been replaced by external/libnl

Change-Id: I1fa964f4fdc24511f497ebadcb4aa3e786fc8456
2014-03-20 13:07:22 -07:00
Mark Salyzyn
a459d0b0e2 cutils: trace 64-bit compile issues
- switch format to PRId64 for int64_t
- switch format to PRId32 for int32_t

Change-Id: I1e66db06810000936d584ed49234550abd96cdff
2014-03-20 13:02:57 -07:00
Samuel Carlsson
912d5dddf8 Adding documentation on the sync part of the adb protocol previously missing.
In the SERVICES.TXT a missing documentation file is mentioned - SYNC.TXT. This file is supposed to contain all the godie bits of the adb protocol for pushing and pulling files. I've read the source code and documented this in the file SYNC.TXT. I've used my own documentation to create a java implementation to verify the documentation here: https://github.com/vidstige/jadb

Added line breaks at 78 characters. Added comments about remote files might be deleted.

Change-Id: I48c87c2a9fb5b59b85c72679124dfbbfa9a701bc
Signed-off-by: Samuel Carlsson <samuel.carlsson@gmail.com>
2014-03-20 20:36:46 +01:00
Alex Ray
c7cd000712 am 64aef64b: am 60357975: Merge "fastbootd: build static binary instead of dynamic"
* commit '64aef64b221223ceaff11572eb7a6b8a95f9cd8a':
  fastbootd: build static binary instead of dynamic
2014-03-20 18:20:51 +00:00
Alex Ray
64aef64b22 am 60357975: Merge "fastbootd: build static binary instead of dynamic"
* commit '603579758661aea4e48853e6caf0b60b2f9d47e4':
  fastbootd: build static binary instead of dynamic
2014-03-20 18:15:16 +00:00
Alex Ray
6035797586 Merge "fastbootd: build static binary instead of dynamic" 2014-03-20 17:58:01 +00:00
Michael Wright
a2910877a6 Merge "Add static methods to BitSet." 2014-03-20 01:15:19 +00:00
Alex Ray
17ab454501 fastbootd: build static binary instead of dynamic
This removes the requirement to hunt down dynamic libs for building an image,
and switches the normal vendor_trigger HAL to a static HAL.

Change-Id: Ifb603f1ee91fbbbff04ddbe66a1bf38a3c22be9e
2014-03-19 15:57:40 -07:00
Alex Ray
597998e604 am 18ad82e0: am 9e3b7723: am 3fcd9ed6: Merge "ueventd: fix klog debug typo"
* commit '18ad82e03a3b7ae54a246085c10b7b0815ea4e32':
  ueventd: fix klog debug typo
2014-03-19 22:38:52 +00:00
Alex Ray
18ad82e03a am 9e3b7723: am 3fcd9ed6: Merge "ueventd: fix klog debug typo"
* commit '9e3b7723d43ac01f34c8b3e49e9ed8f3c84207e7':
  ueventd: fix klog debug typo
2014-03-19 22:34:07 +00:00
Alex Ray
9e3b7723d4 am 3fcd9ed6: Merge "ueventd: fix klog debug typo"
* commit '3fcd9ed6e3c8f68c59d290f70c09dfb91e167328':
  ueventd: fix klog debug typo
2014-03-19 22:28:55 +00:00
Alex Ray
3fcd9ed6e3 Merge "ueventd: fix klog debug typo" 2014-03-19 22:20:43 +00:00
Alex Ray
eb6ffc765b ueventd: fix klog debug typo
Change-Id: Ib0acece15145cc0e868452ede8f3acbab419b965
2014-03-19 15:17:59 -07:00
Colin Cross
72ea19436b am 299b2eec: am 12e3639a: am c383c6d1: Merge "Add "import" support to system property files."
* commit '299b2eecc58d8b3a50cb52e61a61b28aa7f1c038':
  Add "import" support to system property files.
2014-03-19 20:50:25 +00:00
Colin Cross
299b2eecc5 am 12e3639a: am c383c6d1: Merge "Add "import" support to system property files."
* commit '12e3639a6e1cdd77af0964e10081311430fd065c':
  Add "import" support to system property files.
2014-03-19 20:45:37 +00:00
Colin Cross
12e3639a6e am c383c6d1: Merge "Add "import" support to system property files."
* commit 'c383c6d1d8b0541d18924c3ef63df9061ee5bd8f':
  Add "import" support to system property files.
2014-03-19 20:41:36 +00:00
Colin Cross
c383c6d1d8 Merge "Add "import" support to system property files." 2014-03-19 20:32:14 +00:00
Jeff Sharkey
06f8c09542 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:31:36 -07:00
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
Michael Wright
2ec064597c Add static methods to BitSet.
Also, moar testing.

Change-Id: I512b337a1a85a0794445fc6249af7ca39ba7c381
2014-03-19 11:23:01 -07: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