Zach Jang
1f87a820ad
resolve merge conflicts of 12db224
to lmp-mr1-dev am: 0c672afc40
am: cf51c6cb29
am: cbf1e2cc94
am: 9fc3cf7ba2
am: 3749025ccb
am: e7bc1542db
...
am: 1be6c69524
Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
2016-06-22 01:43:47 +00:00
Zach Jang
3749025ccb
resolve merge conflicts of 12db224
to lmp-mr1-dev am: 0c672afc40
am: cf51c6cb29
am: cbf1e2cc94
...
am: 9fc3cf7ba2
Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
2016-06-22 01:35:58 +00:00
Zach Jang
9fc3cf7ba2
resolve merge conflicts of 12db224
to lmp-mr1-dev am: 0c672afc40
am: cf51c6cb29
...
am: cbf1e2cc94
Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
2016-06-22 01:33:23 +00:00
Zach Jang
0c672afc40
resolve merge conflicts of 12db224
to lmp-mr1-dev
...
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
2016-06-21 18:23:46 -07:00
Zach Jang
12db224269
resolve merge conflicts of 24cfbfa
to lmp-dev
...
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
2016-06-21 18:13:17 -07:00
Zach Jang
24cfbfabb7
Updating security string to 2016-08-05 am: 5b14c1f7ce
...
am: 26acdf0c13
Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
2016-06-22 00:44:33 +00:00
Zach Jang
5b14c1f7ce
Updating security string to 2016-08-05
...
b/29513589
Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
2016-06-20 14:30:52 -07:00
Ian Pedowitz
ddc0c5e0a0
Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev
2016-06-08 03:05:40 +00:00
Ian Pedowitz
7a50757731
NYC is 7.0
...
Bug: 29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
2016-06-06 17:08:18 +00:00
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
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
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
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
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
Ian Pedowitz
8313541c65
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
...
Bug: 27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
2016-05-12 10:39:59 -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
Zach Jang
175b7800f4
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
...
b/27724973
Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
2016-03-21 17:42:55 -07:00
Zach Jang
569eec09f5
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba
am: cdbccfd
am: 5b24724
am: 592d1c5
am: bbf3687
am: b294912
...
am: d35bff2
* commit 'd35bff2b9a370bcefd82b0ff0960d90678c7942f':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:25:42 +00:00
Zach Jang
bbf3687eb8
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba
am: cdbccfd
am: 5b24724
...
am: 592d1c5
* commit '592d1c5a46b95015ec831febc953b17b721383e9':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:18:01 +00:00
Zach Jang
592d1c5a46
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba
am: cdbccfd
...
am: 5b24724
* commit '5b24724ccf81ebbcfd20cebcb9f024c8fed3b5f2':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:15:39 +00:00
Zach Jang
2b71be536b
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
...
- kernel updates with patches for CVE-2015-1805
b/27724967
Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f
2016-03-17 17:11:47 -07:00
Zach Jang
7a498bafff
Updating Security Patch String to: 2016-03-18
...
- March 2016 OTA v2
b/27724091
Change-Id: If448a426d78388208e15254ef30b42873a729647
2016-03-17 17:04:32 -07:00
Yohann Roussel
740ec8fe8a
Inform Jack of the min sdk
...
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.
Bug: 27371864
(cherry picked from commit c6383d6ec6
)
Change-Id: Ieba0219494f29d2737d2ca234317c3af7e5e72c8
2016-03-16 15:41:00 +01:00
Ian Pedowitz
e5df61318e
PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2
...
Bug: 27150977
Change-Id: I8b86b5565dbdf81dffb4bc9ba0eef8a3c3f91d20
2016-03-11 22:13:36 -08:00
Zach Jang
17edabb183
Updating security string patch to 2016-04-01 am: e182d2a95c
am: 054bbb9766
am: 7e6a1633c8
am: eb651e2e45
am: 3f53b385de
am: fc30358acb
...
am: c4d9b64a68
* commit 'c4d9b64a686dbfbc8e2f91d96203a7328249f5dd':
Updating security string patch to 2016-04-01
2016-02-19 22:34:03 +00:00
Zach Jang
3f53b385de
Updating security string patch to 2016-04-01 am: e182d2a95c
am: 054bbb9766
am: 7e6a1633c8
...
am: eb651e2e45
* commit 'eb651e2e450f1756e6acea4f570379af7d146920':
Updating security string patch to 2016-04-01
2016-02-19 22:17:28 +00:00
Zach Jang
eb651e2e45
Updating security string patch to 2016-04-01 am: e182d2a95c
am: 054bbb9766
...
am: 7e6a1633c8
* commit '7e6a1633c8ebb622271020cbb0aedae355e6501a':
Updating security string patch to 2016-04-01
2016-02-19 22:11:32 +00:00