In mmc_bootstrap_mmcblk, bootstrap partitions 1-4 instead of 0-3, since
that's how the kernel labels them. Additionally, use the NDOSPART constant
from diskmbr.h instead of hardcoding 4 when scanning partitions.
Signed-off-by: San Mehat <san@google.com>
Merge commit '5f168861beceef1d8c2220993c56312ce0b87dfd'
* commit '5f168861beceef1d8c2220993c56312ce0b87dfd':
remove system server tags from global event.logtags file
Merge commit 'a43d27539156daf08b34bcaa07661fe0e66fa345' into eclair-mr2-plus-aosp
* commit 'a43d27539156daf08b34bcaa07661fe0e66fa345':
remove system server tags from global event.logtags file
Merge commit '73bec02cc3c5e4598c5a4c56cf7843b5a24af31d'
* commit '73bec02cc3c5e4598c5a4c56cf7843b5a24af31d':
construct event-log-tags via the new build mechanism
Merge commit 'f95837a1e13c9b63bfe0b0f95f00ec0d72ba2e74'
* commit 'f95837a1e13c9b63bfe0b0f95f00ec0d72ba2e74':
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
Merge commit '7fa286662790bce1687bd4ff25a6735491392b9c' into eclair-mr2-plus-aosp
* commit '7fa286662790bce1687bd4ff25a6735491392b9c':
construct event-log-tags via the new build mechanism
Merge commit 'cf9f442ef336d4fb6300318a3137b23a4697e048' into eclair-mr2-plus-aosp
* commit 'cf9f442ef336d4fb6300318a3137b23a4697e048':
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
Temporarily creating emulated encrypted directories manually.
Will remove those lines once a true encrypted FS is mounted, and proper
framework chanfes have been made. This is required for the feature to
work with the other changes.
Merge commit 'c1c38dd01c43079ed24b9030bc8a20c649bacc3f' into eclair-mr2
* commit 'c1c38dd01c43079ed24b9030bc8a20c649bacc3f':
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
Changed "process has crashed" message:
- say ":5039" instead of ":port" so mouse-paste of command is trivial
- removed trailing spaces, which consume log buffer to little effect
- improved (I hope) the short explanation of what's going on and
what the HOME key does
Fixed typo ("ignorning").
Merge commit '30ae9fd9513e97b7ce4cea93501ea6971a0bfc8c'
* commit '30ae9fd9513e97b7ce4cea93501ea6971a0bfc8c':
Update db_operation log tag information to match updated sampling code.
Merge commit 'd3fe19fa14102bbd520365beb1a86778ffb8014c' into eclair-mr2-plus-aosp
* commit 'd3fe19fa14102bbd520365beb1a86778ffb8014c':
Update db_operation log tag information to match updated sampling code.
Merge commit 'eb67fac4723892ac8ae3fae87c05e776c49029c5' into eclair-mr2-plus-aosp
* commit 'eb67fac4723892ac8ae3fae87c05e776c49029c5':
change /cache/recovery group to cache
Platforms differ on whether sys/sendfile.h or sys/socket.h is where to
find the declaration for sendfile().
Change-Id: Ib6e882534b7dc605d30aefed55732dc1ee2b6772
Merge commit '6577c0824332165fc49941f813cfefad4fe10a51'
* commit '6577c0824332165fc49941f813cfefad4fe10a51':
Work on issue #2259506: camera ANRed and then device runtime restarted
Merge commit '65b109a246cc7c21da398ccf02083b2abd84f669' into eclair-mr2-plus-aosp
* commit '65b109a246cc7c21da398ccf02083b2abd84f669':
Work on issue #2259506: camera ANRed and then device runtime restarted
Merge commit 'bace01078259614f54c5082fae9ccdb37f27590c' into eclair-mr2
* commit 'bace01078259614f54c5082fae9ccdb37f27590c':
Work on issue #2259506: camera ANRed and then device runtime restarted
* changes:
Encrypted File SYstems project. Enabling EFS security properties. This change enables persist.security.* flags in the device, allowing oly the system to modify them. Change is necessary to allow for further progress in the project, as this is an ideal location for access both from the framework as well as from the recovery mode / transition.
