Commit Graph

1078 Commits

Author SHA1 Message Date
Ian Pedowitz
5fcdec083e Removing N from PLATFORM_VERSION_ALL_CODENAMES
Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030
Fixes: 29117805
2016-06-06 10:06:39 -07:00
Ian Pedowitz
4a0723af3c resolve merge conflicts of 364e42e to master
Change-Id: I0d742baa230d2d55b34de4f4a7a441dfb214d133
2016-06-03 13:00:18 -07:00
Ian Pedowitz
637c0192fc resolve merge conflicts of f2304ce to nyc-mr1-dev
Change-Id: I0a2777aaf06ab70a1b0dfe96ff6ba6b165b0101b
2016-06-03 12:33:43 -07:00
Ian Pedowitz
216b1ed2f5 Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev 2016-06-03 18:11:03 +00:00
Ian Pedowitz
f2304ce367 NYC is now REL
PLATFORM_VERSION_ALL_CODENAMES needs to include N for now

Bug: 28810934
Bug: 29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
2016-06-03 09:40:41 -07:00
Ian Pedowitz
980588ee8d Setting PLATFORM_VERSION(_CODENAME)? to O for master
Bug: 28713307
Change-Id: I6c566aeea3481413f30f155a08ae3226a50a4190
2016-05-31 15:56:06 -07:00
Ian Pedowitz
a9bc052032 Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""
This reverts commit 295ad1f1f1.

Bug: 28713307
Change-Id: Icd4d48f54840cd831780e11386a74c3e1c5ae370
2016-05-31 22:55:18 +00:00
Adam Powell
b9e064bf9c Merge "N is API 24" into nyc-dev am: f211cae2ed am: 4ea89b7e6c
am: 69cab26059

* commit '69cab26059912a8425d963d93feb2fda610fc8bf':
  N is API 24

Change-Id: Iea2c05751b93ad4c143e884616153109dee6b31a
2016-05-26 02:19:54 +00:00
Adam Powell
69cab26059 Merge "N is API 24" into nyc-dev am: f211cae2ed
am: 4ea89b7e6c

* commit '4ea89b7e6c72a8e2c7feb14a5988ed0ccbe7600a':
  N is API 24

Change-Id: If64938bf40a631c809e522960de9f6eab49e04b6
2016-05-26 01:54:46 +00:00
Adam Powell
233e8ae762 Merge "N is API 24" into nyc-dev
am: f211cae2ed

* commit 'f211cae2ede701b58228ff0090bb894f17c0557f':
  N is API 24

Change-Id: I8c04bfc700731a1441365f8d0d86a2c54aa3a305
2016-05-26 01:19:50 +00:00
TreeHugger Robot
f211cae2ed Merge "N is API 24" into nyc-dev 2016-05-26 01:03:09 +00:00
Adam Powell
891d86d492 N is API 24
Change-Id: I8e4fbc1d64a6cd3eb0b4765f696ae48170264d52
2016-05-25 16:48:56 -07:00
Zach Jang
d50770bc03 Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd am: cf227d4401 am: e29b42ffef am: 2be52191be
am: ebf41a3a8b

* commit 'ebf41a3a8b0ca8147756ba98b91742921c09efbe':
  Updating security string to 2016-07-05

Change-Id: I0753d0c4a1cadeb38eca5f85f6702d6e76878551
2016-05-25 21:21:27 +00:00
Zach Jang
ebf41a3a8b Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd am: cf227d4401 am: e29b42ffef
am: 2be52191be

* commit '2be52191bed1d26932f2ed34384d167af69f8a73':
  Updating security string to 2016-07-05

Change-Id: Iee8b639a565f02cc4e943d7388eb906b88c55e75
2016-05-25 21:15:26 +00:00
Zach Jang
7b164ae47e Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd am: cf227d4401
am: e29b42ffef

* commit 'e29b42ffef47991c090ca8008a9addb9e479fc2a':
  Updating security string to 2016-07-05

Change-Id: Ide9c0807d54ed1bab3dc65e0f1c04a4bb856ace2
2016-05-25 21:11:11 +00:00
Zach Jang
e29b42ffef Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd
am: cf227d4401

* commit 'cf227d440176f5c10b252ff75fdc6aabf7d4829d':
  Updating security string to 2016-07-05

Change-Id: Iffcc0c0b77df8d1bbb69bfd69f9ef0818e469c68
2016-05-25 21:02:20 +00:00
Zach Jang
db34ed5f83 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
2016-05-25 20:44:22 +00:00
Zach Jang
bf5d08ecf4 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
2016-05-25 20:39:28 +00:00
Zach Jang
60270ec785 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
2016-05-25 20:07:30 +00:00
Zach Jang
f885e95375 DO NOT MERGE Updating security string to 2016-07-05
b/28912173

Change-Id: I81301d51fd62932005a24178c57a0731566910a6
2016-05-25 19:43:28 +00:00
Zach Jang
ea3b024d7d Updating security string to 2016-07-05
b/28912173

Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
2016-05-25 12:38:46 -07:00
Zach Jang
455532e867 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c am: 3ffee87b5c am: f8a869d5d8 am: fbf01117d3
am: 94034c57ed

* commit '94034c57ed55cd061fc53bb752a2f2903f17e7cd':
  Updating security string to 2016-07-01

Change-Id: I0b22b63a14f05779f9368190d7ce075bd19007c1
2016-05-24 01:27:11 +00:00
Zach Jang
fbf01117d3 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c am: 3ffee87b5c
am: f8a869d5d8

* commit 'f8a869d5d8a3989e240cde063322f9441ad35d16':
  Updating security string to 2016-07-01

Change-Id: I6f30c8da2bb3476dcb2a0d3e5befca81dbd66c0d
2016-05-24 01:22:06 +00:00
Zach Jang
f8a869d5d8 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c
am: 3ffee87b5c

* commit '3ffee87b5cd468aa5bf14a3e326aa080948db4f3':
  Updating security string to 2016-07-01

Change-Id: Id3468f4dbeb626ad3289f5acef32a72e3e18201b
2016-05-24 01:19:54 +00:00
Zach Jang
608f329e07 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
2016-05-24 01:11:45 +00:00
Zach Jang
3e082f1e64 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
2016-05-24 01:09:15 +00:00
Zach Jang
2ee84bf0a5 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
2016-05-24 01:06:37 +00:00
Zach Jang
45ff24a04b Updating security string to 2016-07-01
b/28912173

Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
2016-05-23 13:26:32 -07:00
Zach Jang
89f6f7aa01 DO NOT MERGE Updating security string to 2016-07-01
- for klp-dev only

b/28912173

Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5
2016-05-23 13:19:30 -07:00
Tao Bao
fef5f8e92b Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"
This reverts commit 439971af5d.

Bug: 28713307
Bug: 28817009
Bug: 28767393
Change-Id: I96c9ec9e3f1be6d68eb77df596707568e344a2fc
(cherry picked from commit 295ad1f1f1)
2016-05-18 22:11:29 +00:00
Ian Pedowitz
301d87850e Revert "Setting PLATFORM_VERSION(_CODENAME)? to O for master"
This reverts commit 1a737095c1.

Bug: 28713307
Bug: 28767393
Change-Id: I355e7e6b9c785f7ca92d13eea7730449cfe80653
2016-05-18 22:06:51 +00:00
Tao Bao
295ad1f1f1 Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"
This reverts commit 439971af5d.

Bug: 28713307
Bug: 28817009
Change-Id: I96c9ec9e3f1be6d68eb77df596707568e344a2fc
2016-05-18 12:22:33 -07:00
Ian Pedowitz
1a737095c1 Setting PLATFORM_VERSION(_CODENAME)? to O for master
Change-Id: Ie1385085be01bb8cae6f088e886d680b86e50993
2016-05-12 12:29:22 -07:00
Ian Pedowitz
d93aba9a39 PLATFORM_PREVIEW_SDK_VERSION should be 1 for nyc-mr1-dev for their DP
Bug: 27150977
Change-Id: I735fbb19e68097c17641a01d660780aff1c7748d
2016-05-12 12:08:11 -07:00
Ian Pedowitz
5363df9efa Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
am: 77df46efec

* commit '77df46efec7996325cbdb17b67bcecbbe88bfa6b':
  PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4

Change-Id: I8a7d147837e098b05afd1c098883c53a0dcbce5c
2016-05-12 19:01:17 +00:00
Ian Pedowitz
8313541c65 PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Bug: 27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
2016-05-12 10:39:59 -07:00
Ian Pedowitz
439971af5d Setting PLATFORM_VERSION(_CODENAME)? to NMR1
Fixes: 28713307
Change-Id: I2ba31d71f7e01391f9167b6cc0fe4de61df7b378
2016-05-11 08:12:16 -07:00
TreeHugger Robot
2c7fd2d170 Merge "Describe required format for for PLATFORM_SECURITY_PATCH" into nyc-dev 2016-04-28 05:07:55 +00:00
Zach Jang
b5658074c3 Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b am: 63398dd am: d402579
am: 3f578d2

* commit '3f578d27312e5c075daf7e66787a1b4fe64a8a4e':
  Update security patch string to 2016-06-01

Change-Id: Ia5b128d3719872fd991417620e9bee82dbc5da24
2016-04-20 22:11:57 +00:00
Zach Jang
63398dd7ea 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
2016-04-20 21:42:16 +00:00
Zach Jang
d4b8d2b59f 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
2016-04-20 21:35:11 +00:00
Zach Jang
0a3b3d40c1 Update security patch string to 2016-06-01
b/28269112

Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
2016-04-19 10:56:31 -07:00
Ian Pedowitz
839ec10bbc PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3
Bug: 27150977
Change-Id: I8f13cec505a73678fb605ee3bce00519d16c2f7e
2016-04-08 14:05:00 -07:00
Shawn Willden
f041559cd4 Describe required format for for PLATFORM_SECURITY_PATCH
Hardware-backed keystore attestation and version binding rely on
PLATFORM_SECURITY_PATCH having the format YYYY-MM-DD.

Bug: 22914603
Change-Id: If116e3ca5611920021b098d6b610ae609956aa5c
2016-03-30 07:55:32 -06:00
Zach Jang
901590ae2a Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684 am: f32d07d am: 0cf7987
am: ae7c301

* commit 'ae7c3010265171b2c215c5a30049320ba50265a7':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:10:42 +00:00
Zach Jang
f32d07dd93 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
2016-03-23 01:00:15 +00:00
Zach Jang
6bbd684464 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
2016-03-23 00:56:45 +00:00
Zach Jang
6faa48a0b5 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094 am: fa24625 am: d7bf980 am: 87582a8
am: 880e914

* commit '880e914ec6b8ce053ad5b766a2907afaf0c79673':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 01:03:01 +00:00
Zach Jang
d7bf9800f4 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094
am: fa24625

* commit 'fa2462551694090da0d0c941d805165c2e2f6dc2':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:54:07 +00:00
Zach Jang
fa24625516 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90
am: b90d094

* commit 'b90d09439a5901f78e9eae332f163cdc1ff98f49':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:51:24 +00:00