OSDN Git Service
Zach Jang [Wed, 20 Jul 2016 18:14:48 +0000 (18:14 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a am:
2c64061e72 -s ours am:
f1be3289ff
am:
f1ee7d660f
Change-Id: I18f7a195e607860043eeb0bc5ef4ee28ec8325a1
Zach Jang [Wed, 20 Jul 2016 18:11:18 +0000 (18:11 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a am:
2c64061e72 -s ours
am:
f1be3289ff
Change-Id: I6f093b1be27f18d1d3aea0c44c031cf6c0d67d2d
Zach Jang [Wed, 20 Jul 2016 18:08:46 +0000 (18:08 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a
am:
2c64061e72 -s ours
Change-Id: I134b3a61251b175b01c21ee11997cf85e131308f
Claes Elgemark [Wed, 20 Jul 2016 17:44:42 +0000 (17:44 +0000)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
am:
687c266053
Change-Id: I5531a0fa456311f2a4824c7a9cdb5e3f43461da0
Claes Elgemark [Tue, 2 Jun 2015 09:03:27 +0000 (11:03 +0200)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.
Bug:
30222185
Bug:
30249120
Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
(cherry picked from commit
ec99604b07132358b92bb053777b4db6a0ae0223)
Zach Jang [Wed, 20 Jul 2016 01:14:11 +0000 (01:14 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5
am:
984987506a
Change-Id: Icce72413eaf703145c4e0478926839476df79588
Zach Jang [Wed, 20 Jul 2016 01:10:46 +0000 (01:10 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8
am:
46a86bf9d5
Change-Id: If879ae7d694caa588554628a4fff3558009aa694
Zach Jang [Wed, 20 Jul 2016 01:08:10 +0000 (01:08 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f
am:
c8b3df9fb8
Change-Id: Ie46aa33c4d927bed0024887c3ef59f45f516e3f9
Zach Jang [Wed, 20 Jul 2016 01:05:41 +0000 (01:05 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879
am:
d46066851f
Change-Id: Ibfe7fbdbfa81f053a5dd4082a8ebb403e7c57930
Zach Jang [Wed, 20 Jul 2016 01:02:41 +0000 (01:02 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d
am:
5e9c40c879
Change-Id: I8405b34a45cf8d0a0dc16bfc6b216f5c66b7f6ba
Zach Jang [Wed, 20 Jul 2016 01:00:09 +0000 (01:00 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
am:
4d7c3a4c0d
Change-Id: I848cd6c2068f54c54a53dc5d0bb35c54fc7eb23f
Zach Jang [Tue, 19 Jul 2016 20:20:45 +0000 (13:20 -0700)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
b/
30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:07:28 +0000 (21:07 +0000)]
Merge \\"disable unpriv perf by default in user{,debug} builds\\" into mnc-dev am:
11c84f95fb
am:
a0c61fc832
Change-Id: I3eb533e3084fe53f1739a0428ffe5ff583b1ba91
Daniel Micay [Thu, 23 Jun 2016 21:04:53 +0000 (21:04 +0000)]
Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev
am:
11c84f95fb
Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:00:03 +0000 (21:00 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds" into mnc-dev
Zach Jang [Wed, 22 Jun 2016 01:38:31 +0000 (01:38 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2
am:
3749025ccb
Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
Zach Jang [Wed, 22 Jun 2016 01:35:58 +0000 (01:35 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94
am:
9fc3cf7ba2
Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
Zach Jang [Wed, 22 Jun 2016 01:33:23 +0000 (01:33 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29
am:
cbf1e2cc94
Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
Zach Jang [Wed, 22 Jun 2016 01:30:23 +0000 (01:30 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40
am:
cf51c6cb29
Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
Zach Jang [Wed, 22 Jun 2016 01:27:49 +0000 (01:27 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
am:
0c672afc40
Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
Zach Jang [Wed, 22 Jun 2016 01:23:46 +0000 (18:23 -0700)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
Zach Jang [Wed, 22 Jun 2016 01:13:17 +0000 (18:13 -0700)]
resolve merge conflicts of
24cfbfa to lmp-dev
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
Zach Jang [Wed, 22 Jun 2016 00:44:33 +0000 (00:44 +0000)]
Updating security string to 2016-08-05 am:
5b14c1f7ce
am:
26acdf0c13
Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
Zach Jang [Wed, 22 Jun 2016 00:41:51 +0000 (00:41 +0000)]
Updating security string to 2016-08-05
am:
5b14c1f7ce
Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
Zach Jang [Mon, 20 Jun 2016 21:30:52 +0000 (14:30 -0700)]
Updating security string to 2016-08-05
b/
29513589
Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
Daniel Micay [Tue, 17 May 2016 04:40:52 +0000 (00:40 -0400)]
disable unpriv perf by default in user{,debug} builds
(Cherry picked from commit
f2ac912b19ccbcc15d5176ec52c99744810adce7)
Bug:
29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
Baligh Uddin [Fri, 27 May 2016 23:40:02 +0000 (23:40 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools
am:
e718501021
* commit '
e718501021dd039875745d3ff829341c2bb05248':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I25d3edc76e97f1249768bd9e9bbbecdf8fc5fe79
Baligh Uddin [Fri, 27 May 2016 23:32:09 +0000 (23:32 +0000)]
DO NOT MERGE ANYWHERE -
am:
442ae0fe5c -s ours
* commit '
442ae0fe5c76ddabe52e595689a86838820ecbf1':
DO NOT MERGE ANYWHERE -
Change-Id: I5bbd69cd7d85e3b4257d365efe07c38586d45433
Baligh Uddin [Fri, 27 May 2016 23:28:36 +0000 (16:28 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Baligh Uddin [Fri, 27 May 2016 23:19:57 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE -
Broke the build in mnc-dr-dev
Revert "Add system/extras/verity/build_verity_metadata.py to otatools"
Bug:
29008004
This reverts commit
d26a99c3c6903c02c5435ec5f0123f057527b0a9.
Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423
Baligh Uddin [Fri, 27 May 2016 22:37:29 +0000 (22:37 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools
am:
d26a99c3c6
* commit '
d26a99c3c6903c02c5435ec5f0123f057527b0a9':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I94f04639338cdb961f3c378b12b8778c89fed232
Baligh Uddin [Fri, 27 May 2016 21:59:48 +0000 (14:59 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Zach Jang [Wed, 25 May 2016 20:52:57 +0000 (20:52 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4
am:
db34ed5f83
* commit '
db34ed5f83efc646f37eae8ee61233ee2c2e4979':
Updating security string to 2016-07-05
Change-Id: I9fa607cd71960ac309a5a791e8572a7e183a54d0
Zach Jang [Wed, 25 May 2016 20:44:22 +0000 (20:44 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0
am:
bf5d08ecf4
* commit '
bf5d08ecf4cce47611ee58dbe6b0685e04725c87':
Updating security string to 2016-07-05
Change-Id: I7de8ef605de344ceba9e634ea4f7eb127b91fcf7
Zach Jang [Wed, 25 May 2016 20:39:29 +0000 (20:39 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078
am:
2823643ecd
* commit '
2823643ecdbfd8ad700834dd292fa2b827072634':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I1a9612e6c22d631d634cdab47a733e0e22b285a4
Zach Jang [Wed, 25 May 2016 20:39:28 +0000 (20:39 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad
am:
7cc20fe0a0
* commit '
7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb':
Updating security string to 2016-07-05
Change-Id: I365f9fb0c5e2a29bbf93ea6476d3d697998b90b3
Zach Jang [Wed, 25 May 2016 20:34:47 +0000 (20:34 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours
am:
4c9d484078
* commit '
4c9d484078d45bef09147e5beaf475f9aba96eb4':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: If826c11507df71dc36228d0b5b845078080e37a2
Zach Jang [Wed, 25 May 2016 20:34:46 +0000 (20:34 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f
am:
e7660e56ad
* commit '
e7660e56ad330c8469857014c448130143c86856':
Updating security string to 2016-07-05
Change-Id: I88edd89acdbdd63433fb595a2c7e7a048cd9cdfe
Zach Jang [Wed, 25 May 2016 20:30:15 +0000 (20:30 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4
am:
afbf826576 -s ours
* commit '
afbf826576540aa15310d018235f90f8cfd6c6fc':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I83310642258499e75c191cc9969da5ffa2d91c3d
Zach Jang [Wed, 25 May 2016 20:30:14 +0000 (20:30 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
am:
ab6c08949f
* commit '
ab6c08949f2a96867b1eda536eeb74982a49d5d3':
Updating security string to 2016-07-05
Change-Id: I2357ba1f5ba742ffdeed1fbcd9359405cbb436d8
Zach Jang [Wed, 25 May 2016 20:25:14 +0000 (20:25 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff
am:
e496a955f4
* commit '
e496a955f40fafb3073f7aef8be89c704ce0f01c':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I24dd5be0560f7b6826dfd4700510f2517f1604ff
Zach Jang [Wed, 25 May 2016 20:21:24 +0000 (20:21 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
Zach Jang [Wed, 25 May 2016 20:20:57 +0000 (20:20 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours
am:
1fc50f59ff
* commit '
1fc50f59ff732131122d8fbcdbb497561e434364':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I65cc7edc2d2b69fb7d3fc3745dc3662ddb59be63
Zach Jang [Wed, 25 May 2016 20:16:34 +0000 (20:16 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours
am:
79770b1927 -s ours
* commit '
79770b192771b7e332f1537fef3e3719b07bcf14':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ie757679100cd217973d8371de8a72adc89392bbc
Zach Jang [Wed, 25 May 2016 20:11:54 +0000 (20:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a
am:
60270ec785 -s ours
* commit '
60270ec78531308f91221ca09c74edee6701ec34':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ia89f4840478991109628844f889e6c97677b0d50
Zach Jang [Wed, 25 May 2016 20:07:30 +0000 (20:07 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375
am:
555c5af89a
* commit '
555c5af89a4b25f61ff827431b0081be7b70d5fe':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I7f662a6d72179678beee82b3cfb87525eae2b2c2
Zach Jang [Wed, 25 May 2016 20:03:05 +0000 (20:03 +0000)]
DO NOT MERGE Updating security string to 2016-07-05
am:
f885e95375
* commit '
f885e95375a48aeefd7d2451a5c61a48100bac77':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ic58e87cd25747728aa105047cf81a32253d4aba4
Zach Jang [Wed, 25 May 2016 19:41:59 +0000 (12:41 -0700)]
DO NOT MERGE Updating security string to 2016-07-05
b/
28912173
Change-Id: I81301d51fd62932005a24178c57a0731566910a6
Zach Jang [Wed, 25 May 2016 19:38:46 +0000 (12:38 -0700)]
Updating security string to 2016-07-05
b/
28912173
Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
Zach Jang [Tue, 24 May 2016 01:27:10 +0000 (01:27 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours am:
9ae8c7356e
am:
bc60af7bfd
* commit '
bc60af7bfd4e7190086d59eea53b3dcf3cf40a6d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I4ce025692a6e6c0c96d5657d99131c306a742da4
Zach Jang [Tue, 24 May 2016 01:22:07 +0000 (01:22 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours
am:
9ae8c7356e
* commit '
9ae8c7356efd1eadb9e4043d96cc5dc28ba554b6':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I67fe439474ce9edd47194a926719b71b846a2a56
Zach Jang [Tue, 24 May 2016 01:19:37 +0000 (01:19 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7
am:
8ebaeae1f6 -s ours
* commit '
8ebaeae1f6f0a69fc1bf518558fa463ed0cca6de':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I07650552a45e5e2de1524b43839c895283d17c4a
Zach Jang [Tue, 24 May 2016 01:17:01 +0000 (01:17 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b
am:
3cba9b15f7
* commit '
3cba9b15f7ce25e194a305d37d27424e6923fd4b':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Ib7e12ebb1a9140084a1e3aa28cede2809499004e
Zach Jang [Tue, 24 May 2016 01:14:26 +0000 (01:14 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours
am:
8b961c808b
* commit '
8b961c808b6c67d464f4c070ea46b8a0650595d5':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Id5916f2fa84a2fee99a37a1a8b9fd07d8c58ae0b
Zach Jang [Tue, 24 May 2016 01:14:26 +0000 (01:14 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d am:
3e082f1e64
am:
608f329e07
* commit '
608f329e0718a9ef3ed89b3f9d4768b003bc88de':
Updating security string to 2016-07-01
Change-Id: I93c86db7e020f586784f8a8b106806dbb7874d76
Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours
am:
e495d379de -s ours
* commit '
e495d379decdfea93789c4693dd0f96aac23c34d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I1749805100b45f8f12cac476df8e7be3380fbd54
Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d
am:
3e082f1e64
* commit '
3e082f1e649821f00ec751824e901f64a2756269':
Updating security string to 2016-07-01
Change-Id: I5c04b6e42927d45c9bf0e2f842cd9eac8f62dfa5
Zach Jang [Tue, 24 May 2016 01:09:15 +0000 (01:09 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78
am:
0b4608ca4d
* commit '
0b4608ca4d8b10af335f839350a4224a198e8dee':
Updating security string to 2016-07-01
Change-Id: I08d096476c645d304ab5038cd5ca586073424157
Zach Jang [Tue, 24 May 2016 01:09:14 +0000 (01:09 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3
am:
2ee84bf0a5 -s ours
* commit '
2ee84bf0a56984323154411d60096b691c66b841':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I7a2c2f1d707eb14b56b8e5227724427bdf0e2768
Zach Jang [Tue, 24 May 2016 01:06:37 +0000 (01:06 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01
am:
0bdac8fba3
* commit '
0bdac8fba335f4e1620871bf5082dbebc55a497d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I9c2b97af248ab4007fbfce8d67f9f70b5016687f
Zach Jang [Tue, 24 May 2016 01:06:37 +0000 (01:06 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b
am:
1dd3095e78
* commit '
1dd3095e780dc83aa1b4056f298a4678bead075a':
Updating security string to 2016-07-01
Change-Id: Id2e67d174cc1c79cbc418089aa7870ff38102a08
Zach Jang [Tue, 24 May 2016 01:02:06 +0000 (01:02 +0000)]
Updating security string to 2016-07-01
am:
45ff24a04b
* commit '
45ff24a04bd5d3af706ae3aa6266106560070a3d':
Updating security string to 2016-07-01
Change-Id: I426da21a6ba7c2e62a7f57765c0c35063d151ad4
Zach Jang [Tue, 24 May 2016 01:02:05 +0000 (01:02 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
am:
89f6f7aa01
* commit '
89f6f7aa01591e8524ef0c4b5efa7433d082a9b9':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I0e07966827713405ac2145a44185fe2f485c6e62
Zach Jang [Mon, 23 May 2016 20:26:32 +0000 (13:26 -0700)]
Updating security string to 2016-07-01
b/
28912173
Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
Zach Jang [Mon, 23 May 2016 20:19:30 +0000 (13:19 -0700)]
DO NOT MERGE Updating security string to 2016-07-01
- for klp-dev only
b/
28912173
Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5
Baligh Uddin [Sat, 21 May 2016 00:04:37 +0000 (00:04 +0000)]
Merge commit \'
8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
am:
275af3429f
* commit '
275af3429f3049378862883dc6a0db2701f9311f':
Add Oem Props to otatools package
Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8
Baligh Uddin [Fri, 20 May 2016 23:59:14 +0000 (16:59 -0700)]
Baligh Uddin [Fri, 20 May 2016 23:50:56 +0000 (23:50 +0000)]
Merge commit \'
c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b\' into lmp-mr1-ub-dev
am:
50cae53b10
* commit '
50cae53b10b7e6a18fe6016bd5dc9eaba715545d':
Add Oem Props to otatools package
Change-Id: I4ca967ea935f4a3a5c709047ca2ed486d196e974
Baligh Uddin [Fri, 20 May 2016 23:44:27 +0000 (16:44 -0700)]
Baligh Uddin [Fri, 20 May 2016 18:43:25 +0000 (18:43 +0000)]
Add Oem Props to otatools package
am:
4f8df41cef
* commit '
4f8df41ceff7434ece651737b15bf1035f5549e8':
Add Oem Props to otatools package
Change-Id: I2b5ba1bb090c5144f4ea0b17153352eb31b46e7f
Baligh Uddin [Fri, 20 May 2016 18:29:53 +0000 (11:29 -0700)]
Add Oem Props to otatools package
Bug:
23967152
Baligh Uddin [Thu, 19 May 2016 16:43:34 +0000 (16:43 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
am:
74da4d6eef
* commit '
74da4d6eef1da6490729dfbd069adf913d9aa6fa':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Iefc0f7c90f631d6298931c9426d8edfbb60aa437
Baligh Uddin [Thu, 19 May 2016 15:50:19 +0000 (08:50 -0700)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
otatools.zip is used to release key sign device images.
Bug:
23967152
Tao Bao [Fri, 13 May 2016 22:39:07 +0000 (22:39 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
am:
16536a53a0
* commit '
16536a53a057778240b1a3a923b5dde31b79bd90':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: I07d7bf9a34dabd3646f341427d9f53a74e9e8fc9
Tao Bao [Thu, 27 Aug 2015 00:07:14 +0000 (17:07 -0700)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.
Bug:
28760775
Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
(cherry picked from commit
e8f756137c39fc3292014f2eab5f84c6e5135797)
Tianjie Xu [Fri, 13 May 2016 18:08:12 +0000 (18:08 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
am:
8d11597558
* commit '
8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ie0180bab1d41d86d3d2c3f14501b51b50f74635e
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.
Bug:
28760775
Bug:
28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit
cd1e16a7616092e5a315b0a421a0c082da144145)
Baligh Uddin [Thu, 12 May 2016 23:15:18 +0000 (23:15 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours
am:
7e806813bb -s ours
* commit '
7e806813bb0c3df85c69aaa78a21d0d5dac7e92b':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ic99ba9bb2041840402829b1d2e75684bfbeb66f2
Baligh Uddin [Thu, 12 May 2016 23:12:59 +0000 (23:12 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours
am:
e3b631a5d6 -s ours
* commit '
e3b631a5d62923a381bf0ecb151a1ec9c584380c':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I7f17e328de62c50087bc6d2acf3d8c17f5fb541f
Baligh Uddin [Thu, 12 May 2016 23:10:35 +0000 (23:10 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours
am:
e038da17f3 -s ours
* commit '
e038da17f38eac01e6c971d9f5956ea701a341e2':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ice12c95006ab0b10fa2d2a6413925001249564d8
Baligh Uddin [Thu, 12 May 2016 23:08:02 +0000 (23:08 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours
am:
d28e7ea333 -s ours
* commit '
d28e7ea333986fe820f19f2b34dec074f3b8bc22':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I65fd87879662e05d3906d530d5cba3e0d313990c
Baligh Uddin [Thu, 12 May 2016 23:05:19 +0000 (23:05 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
am:
f193546d65 -s ours
* commit '
f193546d65d41d40bd0e24e9bfe443001a320d1a':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418
Baligh Uddin [Thu, 12 May 2016 22:55:26 +0000 (15:55 -0700)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Bug:
23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
Baligh Uddin [Wed, 11 May 2016 23:30:50 +0000 (16:30 -0700)]
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
This is needed for nemo* signing off emerald-dev.
Bug:
28726512
Baligh Uddin [Tue, 26 Apr 2016 15:48:48 +0000 (15:48 +0000)]
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1 am:
f3b80ae -s ours
am:
d7aa910 -s ours
* commit '
d7aa9105041cae84551651836b50153eca3cc982':
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
Change-Id: I384ba93902526354f52f480f9a3db55c7dfcb918
Baligh Uddin [Tue, 26 Apr 2016 15:45:50 +0000 (15:45 +0000)]
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
am:
f3b80ae -s ours
* commit '
f3b80aed0a13baa078e2dd4c27849ce89307372b':
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
Change-Id: I7002ae9407e6098a9061b7ae11a893ddf19e4de4
Baligh Uddin [Mon, 25 Apr 2016 15:25:22 +0000 (08:25 -0700)]
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
Bug:
23967152
Baligh Uddin [Sun, 24 Apr 2016 19:40:03 +0000 (12:40 -0700)]
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Bug:
23967152
Zach Jang [Wed, 20 Apr 2016 21:47:54 +0000 (21:47 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757 am:
05a8c77 am:
d4b8d2b
am:
63398dd
* commit '
63398dd7ea01ea331e2ea362c3235b79fefd5cfe':
Update security patch string to 2016-06-01
Change-Id: Icea8df8e59f72146ecf737473cbba19d0b6aba5d
Zach Jang [Wed, 20 Apr 2016 21:42:16 +0000 (21:42 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757 am:
05a8c77
am:
d4b8d2b
* commit '
d4b8d2b59f804544e09cb3e600ff290792470999':
Update security patch string to 2016-06-01
Change-Id: I837a9f96b9d35f315b2bf92e600084ecb879b264
Zach Jang [Wed, 20 Apr 2016 21:35:11 +0000 (21:35 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757
am:
05a8c77
* commit '
05a8c77e4231828db15aee343f79ebd2dd6607dd':
Update security patch string to 2016-06-01
Change-Id: I427cd7ac7b33d5f5891ccd96a4fbaeb0a0f7c5e7
Zach Jang [Wed, 20 Apr 2016 19:50:19 +0000 (19:50 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4
am:
0ca3757
* commit '
0ca37573e53bc3a481daa3a807dfc6960227fb0f':
Update security patch string to 2016-06-01
Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2
Zach Jang [Wed, 20 Apr 2016 18:49:54 +0000 (18:49 +0000)]
Update security patch string to 2016-06-01
am:
0a3b3d4
* commit '
0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
Update security patch string to 2016-06-01
Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
Zach Jang [Tue, 19 Apr 2016 17:56:31 +0000 (10:56 -0700)]
Update security patch string to 2016-06-01
b/
28269112
Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
Tianjie Xu [Thu, 24 Mar 2016 17:19:42 +0000 (17:19 +0000)]
Merge "Adjust the size limit for splitting large files" into mnc-dr-dev
am:
7d55185
* commit '
7d551850ddea337b2b35938012e0d13a38c6af65':
Adjust the size limit for splitting large files
Tao Bao [Thu, 24 Mar 2016 17:12:00 +0000 (17:12 +0000)]
Merge "Adjust the size limit for splitting large files" into mnc-dr-dev
Tianjie Xu [Thu, 14 Jan 2016 00:14:10 +0000 (16:14 -0800)]
Adjust the size limit for splitting large files
Modify the number of max blocks per transfer to reduce splitting of
large files during patch generation. This will reduce the size of
final incremental OTA updater package. In specific, the size limit
for each file to transfer is set to 1/8 cachesize instead of a fix
number.
Bug:
26472126
Change-Id: Iffb135e378c4c7a91640f2fc4c40e9e93d1fe4bb
(cherry picked from commit
bb86e1d9c298940a11da0a3d47ed40f7b709194d)
Zach Jang [Wed, 23 Mar 2016 01:03:47 +0000 (01:03 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483 am:
08d9bea am:
6bbd684
am:
f32d07d
* commit '
f32d07dd9328401525e333a34464a1d1f363e524':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 01:00:15 +0000 (01:00 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483 am:
08d9bea
am:
6bbd684
* commit '
6bbd684464a1307f074e6c173a9147d6e2a626f1':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 00:56:45 +0000 (00:56 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483
am:
08d9bea
* commit '
08d9bea41096f7c055cf67860a07436da6712b01':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
OSDN Git Service
