Ying Wang
3d6e194eaf
am 393c6254
: Really include drawables for all densities.
...
* commit '393c62549a6340b3473f14b71d583e118d7e6a6d':
Really include drawables for all densities.
2015-09-29 18:07:41 +00:00
Ying Wang
393c62549a
Really include drawables for all densities.
...
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug: 21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
2015-09-29 09:57:41 -07:00
Zach Jang
92da6bdb09
am 5e858e3d
: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
...
* commit '5e858e3db9f7b2037dc9e03c08f9687d5a6718bd':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
2015-09-28 21:27:22 +00:00
Zach Jang
5e858e3db9
Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
2015-09-28 21:17:41 +00:00
Zach Jang
1a78a8e7fb
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
...
Change-Id: I80e1e5766c33f1a5c1e28e456dfe902bc8886fd4
2015-09-21 17:42:49 -07:00
Zach Jang
6a0bdb5518
am 64685ea3
: am ef024064
: (-s ours) am 09611509
: am 63712481
: am bb97ff59
: am a7168e1c
: am e539537d
: (-s ours) am 7f96f4f6
: am 4c710cbe
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit '64685ea320f8916087b8fd022ab1ce3028bec62a':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-22 00:04:43 +00:00
Zach Jang
22e66b3574
am a5842d3e
: am f694d378
: (-s ours) resolved conflicts for b161297d
to lmp-mr1-ub-dev
...
* commit 'a5842d3e17f2d619f5de7bfae85f58ff9642dae4':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-22 00:04:42 +00:00
Zach Jang
64685ea320
am ef024064
: (-s ours) am 09611509
: am 63712481
: am bb97ff59
: am a7168e1c
: am e539537d
: (-s ours) am 7f96f4f6
: am 4c710cbe
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit 'ef02406452c41f90955460179c1f1d900bcedba9':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 23:57:06 +00:00
Zach Jang
a5842d3e17
am f694d378
: (-s ours) resolved conflicts for b161297d
to lmp-mr1-ub-dev
...
* commit 'f694d378955ddac3ee2651080bfa00c5ae39dddc':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 23:57:04 +00:00
Zach Jang
ef02406452
am 09611509
: am 63712481
: am bb97ff59
: am a7168e1c
: am e539537d
: (-s ours) am 7f96f4f6
: am 4c710cbe
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit '0961150929c775a439f31b8c4fb35ba6a03c6f08':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 21:06:10 +00:00
Zach Jang
f694d37895
resolved conflicts for b161297d
to lmp-mr1-ub-dev
...
Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
2015-09-21 13:00:04 -07:00
Zach Jang
0961150929
am 63712481
: am bb97ff59
: am a7168e1c
: am e539537d
: (-s ours) am 7f96f4f6
: am 4c710cbe
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit '63712481f04b6525288b5df182d6f3e853a3bfb9':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 19:05:35 +00:00
Zach Jang
b161297d4b
am ab095b44
: am 48e2b43e
: am 47ef4c34
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit 'ab095b445af361911df2856e77f43c4cf103a0e2':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 19:05:33 +00:00
Zach Jang
63712481f0
am bb97ff59
: am a7168e1c
: am e539537d
: (-s ours) am 7f96f4f6
: am 4c710cbe
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit 'bb97ff5941b266639e31fd4a30a6d34921e7bc2b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 18:58:22 +00:00
Zach Jang
ab095b445a
am 48e2b43e
: am 47ef4c34
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit '48e2b43e8cc030456b0f625f321c45d2e1775130':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 18:58:10 +00:00
Zach Jang
bb97ff5941
am a7168e1c
: am e539537d
: (-s ours) am 7f96f4f6
: am 4c710cbe
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit 'a7168e1c6ef9e9bc5491b09cb9db683b69e25e2b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-17 20:40:28 +00:00
Zach Jang
a7168e1c6e
am e539537d
: (-s ours) am 7f96f4f6
: am 4c710cbe
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit 'e539537d8c7a4288f40afa9226787b9af3d4416b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-17 20:27:20 +00:00
Zach Jang
e539537d8c
am 7f96f4f6
: am 4c710cbe
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit '7f96f4f6b95de53bd4aaff762885050ad7c4a7be':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-17 20:16:43 +00:00
Zach Jang
7f96f4f6b9
am 4c710cbe
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit '4c710cbe7f5786c3df396ea4283da920fd5c351b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-17 20:04:23 +00:00
Zach Jang
48e2b43e8c
am 47ef4c34
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit '47ef4c3467e4f895b776fb0e8dbcba8f90a9398c':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-17 20:04:17 +00:00
Baligh Uddin
59f4ff109d
Add verity_signer and verity_key flags to add_img_to_target_files.
...
The signing process requires the boot and recovery images be signed
by CROS-Signer, which is done after a signed_target_files.zip is
available. Once the boot/recovery images are signed, we need
to insert it back into signed_target_files.zip and regenerate the
system.map and verity tree. The script (add_img_to_target_files) does
this operation and needs to be aware of verity specific flags.
Bug: 23831896
Change-Id: Id24e878161052c768b74da1231b97eb0574b4c8b
2015-09-16 21:20:30 -07:00
Zach Jang
47ef4c3467
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
...
CL#2/3
b/23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:22:39 +00:00
Zach Jang
4c710cbe7f
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
...
CL#2/3
b/23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:21:39 +00:00
Bo Hu
ca352f3623
am 2ad5c0cc
: Merge "emulator.mk: Add ethernet permission" into mnc-dev
...
* commit '2ad5c0cca46b7f0a159dbc90243756c84a93b093':
emulator.mk: Add ethernet permission
2015-09-16 17:45:59 +00:00
Bo Hu
2ad5c0cca4
Merge "emulator.mk: Add ethernet permission" into mnc-dev
2015-09-16 17:38:07 +00:00
Ian Pedowitz
a0abf49d2b
resolved conflicts for a1fcaf86
to mnc-dr-dev
...
Change-Id: Ie53652faa530a3c9c83f30c8f2b636d90f0f1b7a
2015-09-15 18:39:19 -07:00
leozwang
a1fcaf86c4
Add an option to include a full bootloader in incremental OTA.
...
Bug: 23999213
Change-Id: I6c715eb01048e187622ba1e90c89a3306a294b8a
2015-09-15 08:44:12 -07:00
leozwang
07e0af0d18
am 91c8c66e
: am 17aa06f6
: Fix build.
...
* commit '91c8c66eb033a76e0c5968c23eced5f7bbde6d82':
Fix build.
2015-09-15 07:58:27 +00:00
leozwang
91c8c66eb0
am 17aa06f6
: Fix build.
...
* commit '17aa06f6fe0c10cb3bb84a11dfc78a88a4155adc':
Fix build.
2015-09-15 07:52:08 +00:00
leozwang
1e7f6f7442
Fix build.
...
Convert ota_from_target_files back to symbolic link.
Change-Id: I932ba8c0b15fa71a27083adc92e9f9a90dc82f8c
(cherry picked from commit 17aa06f6fe
)
2015-09-15 07:50:10 +00:00
leozwang
17aa06f6fe
Fix build.
...
Convert ota_from_target_files back to symbolic link.
Change-Id: I932ba8c0b15fa71a27083adc92e9f9a90dc82f8c
2015-09-15 00:41:53 -07:00
Leo Wang
888b6f47c7
am 47f6a4e7
: am 1c1a6d15
: am 2c9dfb82
: am 1d4ad515
: Revert "Add an option to include a full bootloader in incremental OTA."
...
* commit '47f6a4e72592bef7ed91f2541c55c151428e11ad':
Revert "Add an option to include a full bootloader in incremental OTA."
2015-09-15 04:51:19 +00:00
Leo Wang
47f6a4e725
am 1c1a6d15
: am 2c9dfb82
: am 1d4ad515
: Revert "Add an option to include a full bootloader in incremental OTA."
...
* commit '1c1a6d15b2c979f28d3cf9a13e96e16e24be16ec':
Revert "Add an option to include a full bootloader in incremental OTA."
2015-09-15 04:43:38 +00:00
Leo Wang
1c1a6d15b2
am 2c9dfb82
: am 1d4ad515
: Revert "Add an option to include a full bootloader in incremental OTA."
...
* commit '2c9dfb8239bb4cbe1c9118ccc5bd115713f513e6':
Revert "Add an option to include a full bootloader in incremental OTA."
2015-09-15 04:36:53 +00:00
Leo Wang
2c9dfb8239
am 1d4ad515
: Revert "Add an option to include a full bootloader in incremental OTA."
...
* commit '1d4ad5158b2cf2f30269d8f733548188208af64a':
Revert "Add an option to include a full bootloader in incremental OTA."
2015-09-15 04:29:45 +00:00
Leo Wang
1d4ad5158b
Revert "Add an option to include a full bootloader in incremental OTA."
...
This reverts commit 46d5efcd0d
.
Change-Id: Ibd347be362db50c0cdb34bf828718872bd74ad56
2015-09-15 04:03:20 +00:00
leozwang
160603cfc2
am 5837f102
: am 1753b4e9
: resolved conflicts for 00fdede3
to lmp-mr1-ub-dev
...
* commit '5837f1025cf28935f3c6f3e0417dcfeac4d56688':
Add an option to include a full bootloader in incremental OTA.
2015-09-15 01:17:03 +00:00
leozwang
5837f1025c
am 1753b4e9
: resolved conflicts for 00fdede3
to lmp-mr1-ub-dev
...
* commit '1753b4e9e444d9ce57f5ce481ed5e3317670ee31':
Add an option to include a full bootloader in incremental OTA.
2015-09-15 01:07:05 +00:00
bohu
9ee993f60e
emulator.mk: Add ethernet permission
...
Networking on old emulator device(a.k.a. goldfish) relies on RIL;
However, RIL is not available on ranchu device yet. For ranchu device
to have a functional networking, we need to add ethernet permission
and start dhcpcd_eth0 service on ranchu device. This CL adds ethernet
permission to both goldfish (which is harmless) and ranchu devices.
This addition was originally proposed by miroslav.tisma@imgtec.com
and the ethernet permission was only added to arm64 and mips64 after
discussion. With the ranchu device supporting more architectures,
it makes sense to allow this permission on all devices and all CPU
architectures.
related CL by miroslav.tisma@imgtec.com on AOSP:
b09fb84becf73bf2bc578ebf27910d75b79d668a
bug: 24070972
Change-Id: I81ac5d8901adee43784fe9dd45a170fb90bb824a
2015-09-14 16:40:12 -07:00
leozwang
1753b4e9e4
resolved conflicts for 00fdede3
to lmp-mr1-ub-dev
...
Change-Id: If4b79f7ed4d67cd8ed708a84703eac58b1e979ac
2015-09-14 16:39:23 -07:00
leozwang
00fdede320
am 46d5efcd
: Add an option to include a full bootloader in incremental OTA.
...
* commit '46d5efcd0d451a48cc793931efef2b1ca982386d':
Add an option to include a full bootloader in incremental OTA.
2015-09-14 21:27:04 +00:00
leozwang
46d5efcd0d
Add an option to include a full bootloader in incremental OTA.
...
Bug: 23101469
Bug: 23999213
Change-Id: Id5ed748a5639663bb5df954f9375838fd9c295ca
2015-09-14 10:41:34 -07:00
Tao Bao
e35d00d019
am 265d9aeb
: releasetools: Update the fingerprint when signing.
...
* commit '265d9aeb622c5829787b16b903f028cacaa99c18':
releasetools: Update the fingerprint when signing.
2015-09-12 23:00:24 +00:00
Tao Bao
265d9aeb62
releasetools: Update the fingerprint when signing.
...
ro.bootimage.build.fingerprint should be updated when signing.
Bug: 22720426
Bug: 24009888
Change-Id: I5bd31858c6bc31edcecc6f5248f4274481506288
2015-09-11 16:47:28 -07:00
Tao Bao
28f6f9c3de
releasetools: Always write the last block if it's padded.
...
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.
Bug: 23828506
Change-Id: I6f6789eec568ed0b808b9e425f5ecdbea1bdf446
(cherry picked from commit 7589e961a7
)
2015-09-08 10:55:32 -07:00
Tao Bao
a6e6afbce6
am 39c322ce
: releasetools: Fix the bug in symlink deletion.
...
* commit '39c322cefcc0ecba76a2ffb8881694fd010a87fc':
releasetools: Fix the bug in symlink deletion.
2015-09-03 17:26:12 +00:00
Tao Bao
39c322cefc
releasetools: Fix the bug in symlink deletion.
...
For file-based OTAs, symlinks in the source build but not in the target
build will be deleted. However, if a symlink is replaced by a regular
file in the target build, the file will be accidentally deleted when
applying (resuming) the same package again.
Verify the checksum of a symlink that will be unpacked or renamed to.
Delete the file only if it doesn't have the target checksum.
Bug: 23646151
Change-Id: I77bae035e39f2e0be25f7f6d71c5882464e3d50f
(cherry picked from commit 84006eacd0
)
2015-09-02 21:21:17 -07:00
Zach Jang
9f7c37811b
am 057831bc
: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
...
* commit '057831bc665b15d7beda970b91b2c332dee417f0':
Set the Security Patch level with Oct 1 for MNC
2015-09-02 00:04:40 +00:00
Zach Jang
057831bc66
Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
2015-09-01 23:51:02 +00:00
Badhri Jagan Sridharan
dfea066f88
Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
2015-09-01 22:57:27 +00:00