OSDN Git Service
meijjaa [Sat, 21 Oct 2017 11:57:12 +0000 (13:57 +0200)]
Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86
zhang sanshan [Wed, 26 Oct 2016 13:03:37 +0000 (21:03 +0800)]
Fix kernel panic when boot up
Kernel will panic with below log after factory reset:
EXT4-fs error (device mmcblk1p4): ext4_validate_block_bitmap:380: comm init: bg 17: block 557056: invalid block bitmap
Aborting journal on device mmcblk1p4-8.
Kernel panic - not syncing: EXT4-fs (device mmcblk1p4): panic forced after error
Rebooting in 5 seconds.
The root cause is the data type conversion issue on 32 bit devices.
When a 32-bit data mutiply a 32-bit data, it will still get a 32-bit data.
The 64-bit offset will be cut to 32 bit.
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>
Chih-Wei Huang [Tue, 8 Mar 2016 09:14:34 +0000 (17:14 +0800)]
mkuserimg.sh: set default size according to the $SRC_DIR size
Add extra size by the $SRC_DIR size plus 10%.
Chih-Wei Huang [Mon, 19 May 2014 16:38:35 +0000 (00:38 +0800)]
su: disable the legacy su completely
Michael Bestas [Fri, 28 Apr 2017 19:54:43 +0000 (22:54 +0300)]
Use project pathmap for recovery
Change-Id: I5d60aaf79dca15b8a5fcf42fcd1e80f49b0538b3
LuK1337 [Tue, 18 Apr 2017 00:02:19 +0000 (02:02 +0200)]
Update verity_verifier from master branch
Change-Id: I9b1861ae212efc39116591f1208761a50b8ac586
Luca Stefani [Mon, 17 Apr 2017 16:28:06 +0000 (18:28 +0200)]
verity: Include libcrypto_utils_static
Change-Id: Iaf2b7ae49a11e028f4cd1753c5db2a011b1d10f4
Luca Stefani [Mon, 17 Apr 2017 16:29:31 +0000 (16:29 +0000)]
Revert "Revert "Switch to BoringSSL for crypto.""
This reverts commit
442b7846b9389e3787935df55e73c01c92e0631d.
Change-Id: Ib957a2b431ffc07d7e64228f7f20c19fa9a3a78c
LuK1337 [Mon, 17 Apr 2017 10:16:55 +0000 (12:16 +0200)]
Revert "Switch to BoringSSL for crypto."
* Apparently this was picked from n-preview branch and
right now after libcrypto_utils changes in 7.1.2
it breaks the build.
This reverts commit
668f19ad45c192fbcda19ade8f783a4324d508c4.
Change-Id: I87dbef838275fc5b4edc2329c6ec76ba98e828b8
Dan Pasanen [Wed, 5 Apr 2017 14:17:19 +0000 (09:17 -0500)]
Merge tag 'android-7.1.2_r2' into cm-14.1
Android 7.1.2 Release 2 (N2G47E)
Change-Id: I14ec26c4095eaf18fdf05bca4ea42092c5b20a90
David Marble [Wed, 15 Feb 2017 06:53:40 +0000 (00:53 -0600)]
extras: Remove su, we have our own
This got back in somehow. It is defined in our extras/su repo.
Change-Id: Ic109ab15585dd22d16eef377fab64e0f82919d49
Patrick Tjin [Thu, 20 Oct 2016 17:55:11 +0000 (10:55 -0700)]
make_ext4fs: add option to specify the number of inodes [DO NOT MERGE]
Add option to specify the number of inodes to create when
making the filesystem. Read-only partitions don't have
a need for extra inodes, a lot of space is wasted by these
inodes.
Bug:
32246383
Bug:
33252070
Bug:
33428604
Test: make vendor partition with new options
Change-Id: I7063972ec4f4e617d28d2e029ad6a9f8e94add73
(cherry picked from commit
15c434682ac78262d2dad9730805eab52b748cdf)
(cherry picked from commit
7842cd2b1454fb9d4440838b119b99c35b55734b)
Mattias Nissler [Thu, 31 Mar 2016 14:29:37 +0000 (16:29 +0200)]
Switch to BoringSSL for crypto.
Adjust code and dependencies to use BoringSSL + libcrypto_utils
instead of libmincrypt.
Change-Id: Id1b4ee538923e9dac68a7db2521b70007119c268
Tom Marshall [Mon, 14 Dec 2015 19:20:47 +0000 (11:20 -0800)]
ext4_utils: Fix warning when compiling C++ code
* Fixes "#warning: macro min is incompatible with C++. #undefing min"
Change-Id: I2d7a0fd6c7babd0abd5e4c0ece55432f9ea37e95
Ricardo Cerqueira [Mon, 11 Jul 2016 22:59:48 +0000 (23:59 +0100)]
verity: Split the signer arguments correctly
verity_signer can reach the metadata generator with arguments,
which weren't being accounted for when popen'ing the subprocess.
Split the already-existing command string instead of re-generating
the list.
Ref CYNGNOS-3156
Change-Id: Ib8be4312d8e53f00f7378d2eb470de70e8a0495f
Ricardo Cerqueira [Mon, 4 Jul 2016 15:36:17 +0000 (16:36 +0100)]
verity: Let the tools ask for a password if needed
verity keys can be passworded. Let the password prompts and input
come up in cases of scripted signing, so that the password can
be input. While we're at it, make the password prompt print out
the key that is being requested.
This is roughly equivalent to change Icf69ba1e58bf1f91979eaf1d3b91cb202782e8fd
to signapk in build/
Ref CYNGNOS-3156
Change-Id: I4d9cab891b7c4179198ff3f139d25650ee933e53
luca020400 [Tue, 12 Apr 2016 12:30:48 +0000 (14:30 +0200)]
f2fs_utils: Update for f2fs-tools 1.6.1
This reverts commit
0c8a8e101ab5927867417083edc45796967a4e84.
Change-Id: Ia18ecde3b9a94920eb849f6d3ccae2f45d02a48a
luca020400 [Mon, 11 Apr 2016 21:58:23 +0000 (23:58 +0200)]
f2fs_utils: Alloc f2fs_journal
* Fixes encryption
Change-Id: I542ae946bdc44d9c2e9c2dcfd50bbbf40f647b4b
Chih-Hung Hsieh [Fri, 12 Feb 2016 19:16:19 +0000 (11:16 -0800)]
Fix memory leak of dirbuf.
BUG:
26962062
Change-Id: I5fae9eed5b154205a6780fb28c59fccf0b5b16ec
lei wang wang [Mon, 24 Aug 2015 07:47:36 +0000 (15:47 +0800)]
fix bug in mkf2fs tool calculation of f2fs filesystem length
Change-Id: Ifb1f5e70da1faf626ddd9af311556c56ca5cff12
Ankit Gupta [Wed, 23 Dec 2015 22:16:37 +0000 (14:16 -0800)]
bootsignature: includes dt image size for signed boot image
BootSignature truncates the bootimage since dt image size wasn't
considered while calculating the signable bootimage size and thus
target fails to boot. This patch includes the device tree size in
the boot image and prevents it from truncating it and makes the
target boot fine.
Issue-id: YAM-27
Change-Id: Ieaa396159130875768231602cd58eb865d222872
Koushik Dutta [Sat, 1 Jan 2011 23:58:13 +0000 (15:58 -0800)]
mkimage for OMAP
Change-Id: I72ff818d78a877ee8198904919d51577b9aa0c57
Ricardo Cerqueira [Fri, 7 Nov 2014 01:21:24 +0000 (01:21 +0000)]
f2fs_utils: Add a static libf2fs_sparseblock for minvold
Change-Id: Id0947eb304cabbe59c21b8c2e2b81a03cceed619
David Ferguson [Fri, 8 Jun 2012 01:00:41 +0000 (21:00 -0400)]
ext4_utils: add BoardConfig define to suppress EMMC-corrupting wipe command
If BOARD_SUPPRESS_EMMC_WIPE is true, the EMMC wipe command will not be
issued. This works around a bug in some firmware revisions of Samsung EMMC's
that permanently damages the device when the wipe command is issued.
For affected devices with kernel source, MMC_CAP_ERASE should be removed
from the kernel instead.
This is only part of the solution but it does handle the "flashing CM9
for the first time on an unsafe kernel" situation.
Change-Id: Ie4e31f9268a65218e5d344ae3068b021790fc33c
Keith Mok [Thu, 3 Sep 2015 18:36:51 +0000 (11:36 -0700)]
Add darwin support for the host tools
There is some symbol name conflict in the make_f2fs and the library
it loaded which darwin and linux handle that in a different way.
Remove the symbol name conflicts as cannot find a way to set symbol
resolving priority in darwin.
Change-Id: Iabe5c1b594daacd65b9ec2f694a2b5ab5575cfce
Dan Pasanen [Sun, 9 Nov 2014 22:43:22 +0000 (16:43 -0600)]
extras: remove su, we have our own
Change-Id: I18e9819efc3e7aed56e4fb19b0fa4f4bf4bd902e
Extras: gitignore su
Change-Id: Iff5a1a6962ee1633f833f5dd998e62ecf6e5f0af
Steve Kondik [Sat, 16 Nov 2013 15:36:33 +0000 (07:36 -0800)]
ext4_utils: Yet another MMC discard pain in the ass
* Secure discard on this device is painfully slow. Use regular
discard until the issue is sorted out.
Change-Id: Ib8ccb12829385aa267253f772e243bef8850f455
ext4_utils: Add NO_SECURE_DISCARD boardconfig option
* In N CFLAGS in device tress are prohibited
Change-Id: Iea6a4145d1e460d61115b7d6f5a754996c7c9b28
Linux Build Service Account [Thu, 15 Dec 2016 10:06:31 +0000 (03:06 -0700)]
Merge
5229c868904a674aa94e708886c3502e4a6623a0 on remote branch
Change-Id: I007be70ce9168f3e32b2e48cef97099c72fdb9d7
Naveen Kumar [Wed, 7 Dec 2016 14:42:27 +0000 (20:12 +0530)]
Merge N-MR1 to remote branch.
Change-Id: I64e165c5b8587138a80bcd02cdf25dfbd244c440
Lalit Kansara [Tue, 6 Dec 2016 09:42:39 +0000 (15:12 +0530)]
Merge commit '
96c347a9b99d0c5a22d76a5661489a4b7623d183' into remote
Conflicts:
ext4_utils/ext4_crypt.cpp
Change-Id: I7e6ae2bc067b0979a4053691dfe77ed4344b4c39
Linux Build Service Account [Tue, 6 Dec 2016 07:55:22 +0000 (00:55 -0700)]
Merge
d83a851b136575e235a5727aedfec7d5f2a86ce3 on remote branch
Change-Id: Idfe6ba97a2a6b715baf667224b840985ee75061b
Tao Bao [Tue, 29 Nov 2016 18:14:11 +0000 (18:14 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am:
989f6a13a7 am:
533ed53bc0 am:
3734580187
am:
69dd400b72
Change-Id: I9ac01c8b23f58972b1867822c197c36909d771d2
Tao Bao [Tue, 29 Nov 2016 18:09:11 +0000 (18:09 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am:
989f6a13a7 am:
533ed53bc0
am:
3734580187
Change-Id: Id3fd5d9611e86735f5cb54f7888048ff7c108f3b
Tao Bao [Tue, 29 Nov 2016 18:04:10 +0000 (18:04 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC. am:
989f6a13a7
am:
533ed53bc0
Change-Id: I1eca68a42d8c935f95e6dbeadd8e52ca5df48d01
Tao Bao [Tue, 29 Nov 2016 17:59:10 +0000 (17:59 +0000)]
DO NOT MERGE verity_verifier: Support verifying images with FEC.
am:
989f6a13a7
Change-Id: I7e9bebaafac56456c618befee18f971114e24b85
Tao Bao [Tue, 18 Oct 2016 20:02:14 +0000 (13:02 -0700)]
DO NOT MERGE verity_verifier: Support verifying images with FEC.
The current VerityVerifier.jar cannot verify verity images with FEC
metadata (since N). Replace it with a new verity verifier that uses
libfec to parse and verify verity metadata.
It accepts the same command line arguments as the old verity_verifier
script.
Usage: verity_verifier <image> -mincrypt <verity_key>
image the image file (raw or sparse image) to be verified
verity_key the verity key in mincrypt format (/verity_key on device)
Note: this is a backport of commit
bb634ff8dab6327bd38eadee22d5f8ec9d3940d0. It uses the mincrypt headers
and functions instead.
Bug:
32173582
Test: $ verity_verifier $OUT/system.img -mincrypt $OUT/root/verity_key
VERIFIED
Change-Id: I8624973715dcd0f6d89d408c1c97bf584b50ce06
(cherry picked from commit
bb634ff8dab6327bd38eadee22d5f8ec9d3940d0)
Sami Tolvanen [Sun, 20 Nov 2016 06:27:03 +0000 (06:27 +0000)]
DO NOT MERGE: libfec: allow fec_header to be located anywhere
am:
549f048fcb
Change-Id: Ie9b58e09558995ccd52004e82add513483df5d69
Sami Tolvanen [Sun, 20 Nov 2016 06:27:01 +0000 (06:27 +0000)]
DO NOT MERGE: fec: add --padding
am:
61fce29c45
Change-Id: Ia302825abf17edc824a37cd3085f02946deb9d12
Sami Tolvanen [Sun, 20 Nov 2016 06:26:59 +0000 (06:26 +0000)]
DO NOT MERGE: fec: remove unneeded target executable
am:
955d3afe95
Change-Id: Iaf46fa50e6944376497520a191518b7ba916cae9
Sami Tolvanen [Sun, 20 Nov 2016 06:26:58 +0000 (06:26 +0000)]
DO NOT MERGE: fec: remove unused mmap code
am:
cace33a52a
Change-Id: I8597822eb5f71f001d8ce2ac651c641d4f3a1030
Sami Tolvanen [Thu, 1 Sep 2016 22:51:12 +0000 (15:51 -0700)]
DO NOT MERGE: libfec: allow fec_header to be located anywhere
Don't require fec_header to be immediately after ECC data.
Bug:
28865197
Bug:
32789520
Change-Id: Ie8faeeb07c35e2593553f7678762aae7f14c2ff7
(cherrypicked from commit
d9fd5b0d7507877ad6a0ede10c473fe2970d278d)
Sami Tolvanen [Thu, 1 Sep 2016 21:54:09 +0000 (14:54 -0700)]
DO NOT MERGE: fec: add --padding
Add an option to insert padding between ECC data and fec_header to
make it easier to position the header at the end of the partition.
Bug:
28865197
Bug:
32789520
Change-Id: I8c11401df56d15362fe3eb3c2a6a91ea82b02a83
(cherrypicked from commit
85e592cb86c9cbca82852240f0148adbee1b74e8)
Sami Tolvanen [Thu, 1 Sep 2016 20:43:51 +0000 (13:43 -0700)]
DO NOT MERGE: fec: remove unneeded target executable
Bug:
32789520
Change-Id: Ic925814191b8ac952b584a994cf455f871a8ee0c
(cherrypicked from commit
4c716c92a691e6b39e8e65a397f9b6e91f9e07ee)
Sami Tolvanen [Thu, 1 Sep 2016 20:35:17 +0000 (13:35 -0700)]
DO NOT MERGE: fec: remove unused mmap code
Bug:
32789520
Change-Id: If4b32546c6678afaaebffbcf1fbeee17a1879561
(cherrypicked from commit
8bad827700bae35005872f3e6d674c5144fda8ff)
Linux Build Service Account [Thu, 3 Nov 2016 19:38:24 +0000 (13:38 -0600)]
Promotion of android-framework.lnx.2.0-00017.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1079712 Ib1d3ec57240045db5dc42cf8afea11af313ba8f1 ext4 crypt: enable ICE with FBE encryption
Change-Id: I49efa72279b5c89b47fbd8d27bdd59a71df935f8
CRs-Fixed:
1079712
Tao Bao [Wed, 26 Oct 2016 22:27:01 +0000 (22:27 +0000)]
build_verity_metadata: Support --signer_args argument. am:
1522691d1d am:
c2e9c0f0fc am:
c681cb32b3
am:
b91b1cd229
Change-Id: I2fdccda3685d5c255dda29680aa1f9ea7629fd47
Tao Bao [Wed, 26 Oct 2016 22:23:00 +0000 (22:23 +0000)]
build_verity_metadata: Support --signer_args argument. am:
1522691d1d am:
c2e9c0f0fc
am:
c681cb32b3
Change-Id: Ifdaf37a7a04172798ce3ab125c799c819f350de3
Tao Bao [Wed, 26 Oct 2016 22:18:30 +0000 (22:18 +0000)]
build_verity_metadata: Support --signer_args argument. am:
1522691d1d
am:
c2e9c0f0fc
Change-Id: Id0290ac657b6ebd1c6ec59f6ac5f44cd3806d5d7
Tao Bao [Wed, 26 Oct 2016 22:13:29 +0000 (22:13 +0000)]
build_verity_metadata: Support --signer_args argument.
am:
1522691d1d
Change-Id: I9827575704475f3781a214ab73a3b82b7bd00e38
Tao Bao [Mon, 17 Oct 2016 23:06:31 +0000 (16:06 -0700)]
build_verity_metadata: Support --signer_args argument.
Use argparse to parse input parameters for future extension.
Add 'build' and 'size' as two sub-commands.
- 'build_verity_metadata.py -s SIZE' becomes
'build_verity_metadata.py size SIZE'.
- 'build_verity_metadata.py BLOCKS METADATA_IMAGE ...' becomes
'build_verity_metadata.py build BLOCKS METADATA_IMAGE ...'.
The 'build' command now accepts an optional argument '--signer_args' to
specify signer specific arguments.
Bug:
31500665
Test: Building and signing work w/ and w/o --signer_args.
Change-Id: I3cfd2b584efad216b91d5fcd0314f4468ff7450f
(cherry picked from commit
39d1756abe66538a6cbdfc4c7b5377ce279e332c)
Andrey Markovytch [Wed, 19 Oct 2016 12:22:28 +0000 (15:22 +0300)]
ext4 crypt: enable ICE with FBE encryption
updated encryption policy for HW support with FBE
Change-Id: Ib1d3ec57240045db5dc42cf8afea11af313ba8f1
Zhengyin Qian [Wed, 7 Sep 2016 22:57:23 +0000 (15:57 -0700)]
ANRdaemon: fix a bug in handling dump request when trace is running.
Change-Id: I16e2be8b90841eef251c83eda9f71c8e70f519ad
Damien Bargiacchi [Wed, 24 Aug 2016 20:36:35 +0000 (20:36 +0000)]
Merge "Remove unused function declarations" into cw-f-dev
Lalit Kansara [Wed, 20 Jul 2016 10:05:33 +0000 (15:35 +0530)]
Revert "make_ext4fs: write out super blocks at last for block devices".
This reverts commit
aaf32ea5166b6b86023dc283311228cdebb3dc02.
Change-Id: If46c9cc186be64b08668adb0c76f5d06f4e6017f
Damien Bargiacchi [Wed, 17 Aug 2016 00:42:39 +0000 (17:42 -0700)]
Remove unused function declarations
Change-Id: I71dc112b3e1028e3ec3d3c1ec832959b1232f2f6
gitbuildkicker [Thu, 11 Aug 2016 08:07:02 +0000 (01:07 -0700)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
Nick Desaulniers [Thu, 11 Aug 2016 00:32:59 +0000 (00:32 +0000)]
Merge "procrank: fix bounds check to prevent heap overflow" into nyc-mr1-dev
am:
96eaef2510
Change-Id: I9dc98b9c1d27dcee8d74bdabf00422dc8dfd6abf
Nick Desaulniers [Thu, 11 Aug 2016 00:32:59 +0000 (00:32 +0000)]
procrank: fix bounds check to prevent heap overflow
am:
98a20cd128
Change-Id: I9e79ff3f83f36b68fa119d1b95f235a804cfb34e
Nick Desaulniers [Thu, 11 Aug 2016 00:24:09 +0000 (00:24 +0000)]
Merge "procrank: fix bounds check to prevent heap overflow" into nyc-mr1-dev
Nick Desaulniers [Wed, 10 Aug 2016 22:44:19 +0000 (15:44 -0700)]
procrank: fix bounds check to prevent heap overflow
Bug:
30774296
Change-Id: I44005caaa3cc17fe829f375a4cfeb5a464c97fbe
gitbuildkicker [Wed, 10 Aug 2016 08:07:22 +0000 (01:07 -0700)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
John Reck [Tue, 9 Aug 2016 21:50:01 +0000 (21:50 +0000)]
Fix binderAddInts benchmark
am:
187816e579
Change-Id: I5629093163fe4e58a5d09563aa47a5086e423833
John Reck [Tue, 9 Aug 2016 20:06:21 +0000 (13:06 -0700)]
Fix binderAddInts benchmark
Bug:
30765667
Restores the fork() that was missed in a refactor
causing the benchmark to no longer measure binder's
IPC performance.
Change-Id: Id79ab082f1d20e1d058f80bd43018c9737b8250b
Zhengyin Qian [Tue, 9 Aug 2016 17:56:51 +0000 (10:56 -0700)]
Fix lsof option in anrd script.
Change-Id: Ib0043c51ed289469dbef33d9333b1e6113c3b23e
Nancy Zheng [Sat, 6 Aug 2016 01:48:20 +0000 (18:48 -0700)]
Fix missing pipe in ANRdaemon.
Change-Id: I1322ed51f0f1456ebfb8cbb1404772f7fc2bf840
gitbuildkicker [Sun, 31 Jul 2016 08:08:58 +0000 (01:08 -0700)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
Fyodor Kupolov [Thu, 28 Jul 2016 01:01:24 +0000 (01:01 +0000)]
Run preloads_copy.sh as system:system
am:
17985b261d
Change-Id: Ibd98f4f6153db24e6d1b8bf7722a0d023466d875
Fyodor Kupolov [Wed, 27 Jul 2016 22:32:23 +0000 (22:32 +0000)]
Optional script to copy preloads to data directory
am:
9b8b12f84e
Change-Id: I417fb2c538507242cb9bfa31ed638a25c79ec81f
Fyodor Kupolov [Wed, 27 Jul 2016 21:50:04 +0000 (14:50 -0700)]
Run preloads_copy.sh as system:system
Root is not required, and most importantly system_server won't be able delete
preloads folder during cleanup.
Bug:
30280710
Change-Id: I41890834467cc51b7b4ebd9c2918a47904f0b377
Fyodor Kupolov [Mon, 25 Jul 2016 18:55:15 +0000 (11:55 -0700)]
Optional script to copy preloads to data directory
Bug:
29940807
Change-Id: Iba4deaecb5a4055ad10b92829f37ecd3cf8a5ee0
gitbuildkicker [Wed, 20 Jul 2016 08:07:18 +0000 (01:07 -0700)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
Wei Wang [Mon, 18 Jul 2016 18:41:18 +0000 (11:41 -0700)]
cppreopts: parallel cppreopts to improve performance
Bug:
30118894
Bug:
30189706
Change-Id: I0ed0c69873313a3bfaf2e1ff217da59b0f8929c1
gitbuildkicker [Wed, 13 Jul 2016 08:07:18 +0000 (01:07 -0700)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
Jed Estep [Fri, 20 May 2016 23:58:59 +0000 (16:58 -0700)]
Basic A/B bootloader tests via bootctl
Change-Id: Ie7868cc205859c657e905e60ab6928517f02edb8
The Android Automerger [Sun, 3 Jul 2016 08:10:32 +0000 (01:10 -0700)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
Alex Light [Tue, 21 Jun 2016 23:17:48 +0000 (16:17 -0700)]
Copy preopted files from B partition.
This translates from the preopted files in the system_other partition
into the main dalvik-cache. This also has init scripts to allow this
to run.
We first copy to a temporary file before renaming them in order to
make the copy atomic.
Bug:
29278988
Change-Id: I8bf1b2d021998949fd9996a923be7db9691e6a1e
Alex Light [Wed, 29 Jun 2016 20:26:04 +0000 (20:26 +0000)]
Merge "Copy preopted files from B partition." into nyc-mr1-dev
Zhengyin Qian [Wed, 29 Jun 2016 17:55:47 +0000 (17:55 +0000)]
ANRdaemon: move trace result from /sdcard to /data am:
d93aa41807 am:
adfc967454
am:
20e3c1bc94
Change-Id: Ib688c2e38c181d6fdc2ca901782934dc4726eb52
Zhengyin Qian [Wed, 29 Jun 2016 17:53:11 +0000 (17:53 +0000)]
ANRdaemon: move trace result from /sdcard to /data am:
d93aa41807
am:
adfc967454
Change-Id: I4f8d4551c3ab2f5430600af833ced564aa328a55
Zhengyin Qian [Wed, 29 Jun 2016 17:50:00 +0000 (17:50 +0000)]
ANRdaemon: move trace result from /sdcard to /data
am:
d93aa41807
Change-Id: I487116b8261bcef0fc9b829eaf38408d8a47ee78
Alex Light [Tue, 21 Jun 2016 23:17:48 +0000 (16:17 -0700)]
Copy preopted files from B partition.
This translates from the preopted files in the system_other partition
into the main dalvik-cache. This also has init scripts to allow this
to run.
We first copy to a temporary file before renaming them in order to
make the copy atomic.
Bug:
29278988
Change-Id: I8bf1b2d021998949fd9996a923be7db9691e6a1e
The Android Automerger [Tue, 28 Jun 2016 08:07:30 +0000 (01:07 -0700)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
The Android Automerger [Tue, 28 Jun 2016 07:04:19 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev
Yabin Cui [Mon, 27 Jun 2016 23:53:39 +0000 (23:53 +0000)]
Simpleperf: fix flaky tests.
am:
a486a4b8ae
Change-Id: I194792e233c6ccdd695e04ed2a58f7f1034f0494
Yabin Cui [Mon, 27 Jun 2016 23:00:20 +0000 (16:00 -0700)]
Simpleperf: fix flaky tests.
Simpleperf stat/record command may need 1 second to set security.perf_harden
property. So the monitored child threads should run longer than 1 second.
Bug:
29763505
Change-Id: I9bf6dcba03f3fc5c91130f38a08ce0062e104103
Zhengyin Qian [Tue, 21 Jun 2016 21:05:44 +0000 (14:05 -0700)]
ANRdaemon: move trace result from /sdcard to /data
Bug:
28765756
Change-Id: Ic9461bc66c8ba4df1455d8b75c4fb6b544d0cf27
The Android Automerger [Sun, 19 Jun 2016 08:08:49 +0000 (01:08 -0700)]
merge in nyc-mr1-release history after reset to nyc-mr1-dev
Mohamad Ayyash [Wed, 15 Jun 2016 22:53:55 +0000 (15:53 -0700)]
mksquashfsimage.sh: Make disable-4k-align a paramter
BUG:
29388879
Change-Id: I6ede2273419ba986d08decc0540741c54ed736b1
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Jeremy Compostella [Tue, 10 May 2016 09:53:06 +0000 (11:53 +0200)]
libfec: pack the fec_header structure
The fec_header structure is generated build time and stored on disk.
The fec_header might be build on a 64 bits machine while it is read
per a 32 bits device or the other way around. In such situations, the
fec_header fields are not aligned as expected by the device and it
fails to read the fec_header structure.
This patch makes the fec_header packed.
Change-Id: I77546f850cea5559909971a1192e1a7616d22d50
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Mohamad Ayyash [Thu, 16 Jun 2016 20:17:32 +0000 (13:17 -0700)]
resolve merge conflicts of
041bdd8 to nyc-mr1-dev
Change-Id: I8b9b227f8afedb1eb77de8be9de689e3c621003e
Thierry Strudel [Thu, 16 Jun 2016 19:15:40 +0000 (19:15 +0000)]
Merge "libfec: pack the fec_header structure" into nyc-mr1-dev
Jeremy Compostella [Tue, 10 May 2016 09:53:06 +0000 (11:53 +0200)]
libfec: pack the fec_header structure
The fec_header structure is generated build time and stored on disk.
The fec_header might be build on a 64 bits machine while it is read
per a 32 bits device or the other way around. In such situations, the
fec_header fields are not aligned as expected by the device and it
fails to read the fec_header structure.
This patch makes the fec_header packed.
Change-Id: I77546f850cea5559909971a1192e1a7616d22d50
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Mohamad Ayyash [Thu, 16 Jun 2016 16:24:33 +0000 (16:24 +0000)]
Merge "mksquashfsimage.sh: Make disable-4k-align a paramter" into nyc-dev
The Android Automerger [Thu, 16 Jun 2016 07:04:45 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev
Mohamad Ayyash [Wed, 15 Jun 2016 22:53:55 +0000 (15:53 -0700)]
mksquashfsimage.sh: Make disable-4k-align a paramter
BUG:
29388879
Change-Id: I6ede2273419ba986d08decc0540741c54ed736b1
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Wed, 15 Jun 2016 16:38:04 +0000 (09:38 -0700)]
resolve merge conflicts of
7354c0e to nyc-mr1-dev
Change-Id: I19693f5459794b71decfae4507fb2742c74f7c41
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge changes from topic 'squashfs_ota_incrementals' into nyc-dev
* changes:
Disable fragments and duplicates detection for squashfs
mksquashfsimage.sh: Add support for passing block map files
Mohamad Ayyash [Tue, 24 May 2016 20:53:53 +0000 (13:53 -0700)]
Disable fragments and duplicates detection for squashfs
They don't play nicely with generating block maps. Fragments reduce
performance. A later patch will add workaround for duplicate detection.
BUG:
22322817
Change-Id: I01c731202ef7a2450b5d1beca627a0158c9cc3b4
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Mon, 13 Jun 2016 21:45:31 +0000 (14:45 -0700)]
mksquashfsimage.sh: Add support for passing block map files
BUG:
22322817
Change-Id: I7e17f6ad3a503ee97f7a81a1a8382cff47a913c6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
The Android Automerger [Sun, 12 Jun 2016 07:05:22 +0000 (00:05 -0700)]
merge in nyc-release history after reset to nyc-dev