Commits · nougat-mr1-cts-release · halo / rockchip_libcore

13 Jan, 2017 4 commits
- Merge "Merge commit '9f37302e' into... · 510a2eff
  Treehugger Robot authored 8 years ago
```
Merge "Merge commit '9f37302e' into nougat-mr1-cts-dev." into nougat-mr1-cts-dev
```
  510a2eff
- Merge commit '9f37302e' into · 04068449
  Xin Li authored 8 years ago
```
nougat-mr1-cts-dev.

BUG: 33090058
Change-Id: I5c6bf326e05fa0eeee354e1a9aa33fee72740159
```
  04068449
- Merge "Merge commit 'fc575bca' into... · 1c26d74d
  Treehugger Robot authored 8 years ago
```
Merge "Merge commit 'fc575bca' into nougat-mr1-cts-dev" into nougat-mr1-cts-dev
```
  1c26d74d
- Merge commit 'fc575bca' into nougat-mr1-cts-dev · 7a70344e
  Xin Li authored 8 years ago
```
BUG: 33090058
Change-Id: I1caa61ea452dd419afe5acc15b3e230a7ad7664f
```
  7a70344e
21 Dec, 2016 1 commit

DO NOT MERGE: CertificateTest: explicitly set validity check date · f26dd88f

Kenny Root authored 8 years ago

Since this test uses pre-generated certificates, they will expire
eventually given enough time. Instead of regenerating them, just set the
date in the PKIXParameters to compare their validity against.

(cherry picked from commit 4412830e)

Test: vogar --mode host --classpath out/host/common/obj/JAVA_LIBRARIES/core-tests-support-hostx_intermediates/classes.jack --classpath out/host/common/obj/JAVA_LIBRARIES/core-tests-hostdex_intermediates/classes.jack libcore/luni/src/test/java/tests/targets/security/cert/CertificateTest.java
Bug: 32756119
Bug: 32767302
Change-Id: Id48ecf289277ae9d98642b15aaa17c126bdc43e9
(cherry picked from commit 3fdd10e6)
(cherry picked from commit 06673ab2)

f26dd88f

17 Nov, 2016 1 commit
- Merge "DO NOT MERGE Relax N CTS about whether \t is allowed in header values" into nougat-cts-dev · 9f37302e
  Tina Zhou authored 8 years ago
  
  9f37302e
16 Nov, 2016 34 commits

Merge "Merge "Merge "CertificateTest: explicitly set validity check date" into... · 5f6845c6

Android Merger authored 8 years ago

Merge "Merge "Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev am: 348c0155" into marshmallow-cts-dev am: 6bb2a718" into nougat-cts-dev

5f6845c6

Merge "Merge "CertificateTest: explicitly set validity check date" into... · 3524824c

Android Merger authored 8 years ago

Merge "Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev am: 348c0155 am: 1a235012" into nougat-cts-dev

3524824c

Merge "Merge "CertificateTest: explicitly set validity check date" into... · fd432b70

Tina Zhou authored 8 years ago

Merge "Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev am: 348c0155" into marshmallow-cts-dev
am: 6bb2a718

Change-Id: I1775ecb3d4569b302fa0cc613fa8dbfc3ba79605

fd432b70

Merge "CertificateTest: explicitly set validity check date" into... · 8e40ec6d

Tina Zhou authored 8 years ago

Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev am: 348c0155
am: 1a235012

Change-Id: I782821eb63a0ecd38b3ac9adff3a77f576e66be3

8e40ec6d

Merge "Merge "CertificateTest: explicitly set validity check date am:... · afe62caf

Android Merger authored 8 years ago

Merge "Merge "CertificateTest: explicitly set validity check date am: 9a659a11" into marshmallow-cts-dev am: 1c165243" into nougat-cts-dev

afe62caf

Merge "CertificateTest: explicitly set validity check date am: 9a659a11 am:... · e26a5252
Android Merger authored 8 years ago
```
Merge "CertificateTest: explicitly set validity check date am: 9a659a11 am: 730485e1" into nougat-cts-dev
```
e26a5252
Merge "CertificateTest: explicitly set validity check date am: 9a659a11" into marshmallow-cts-dev · ec9773b5
Kenny Root authored 8 years ago
```
am: 1c165243

Change-Id: Icc87b4f492a7c7495539355a3fbe6da1ef92f065
```
ec9773b5
CertificateTest: explicitly set validity check date am: 9a659a11 · c9246a38
Kenny Root authored 8 years ago
```
am: 730485e1

Change-Id: I926e585f7cfb0501902c2a296e8420ddc6a94a22
```
c9246a38

Merge "Merge "CertificateTest: explicitly set validity check date" into... · 6bb2a718

Android Merger authored 8 years ago

Merge "Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev am: 348c0155" into marshmallow-cts-dev

6bb2a718

Merge "CertificateTest: explicitly set validity check date am: 9a659a11 " into marshmallow-cts-dev · 1c165243
Android Merger authored 8 years ago

1c165243
Merge "CertificateTest: explicitly set validity check date" into lollipop-mr1-cts-dev · 1a235012
Tina Zhou authored 8 years ago
```
am: 348c0155

Change-Id: I1b0edf6e5d9e214cb3e78c7acceefe26f8490f79
```
1a235012
CertificateTest: explicitly set validity check date · 730485e1
Kenny Root authored 8 years ago
```
am: 9a659a11

Change-Id: I00c75dd8f16574851de245d55ca10d94ef663432
```
730485e1

Merge "Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability... · f8529c40

Android Merger authored 8 years ago

Merge "Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252  -s ours" into lollipop-mr1-cts-dev am: 142da70e  -s ours" into marshmallow-cts-dev am: 892b3636  -s ours" into nougat-cts-dev

f8529c40

Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability... · 8c043717

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252  -s ours" into lollipop-mr1-cts-dev am: 142da70e  -s ours am: 4af2cb0a  -s ours" into nougat-cts-dev

8c043717

Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability... · 931215c5

Tina Zhou authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252 -s ours" into lollipop-mr1-cts-dev am: 142da70e -s ours" into marshmallow-cts-dev
am: 892b3636 -s ours

Change-Id: I76380c331727dd2786526cf2f8d8189bab6319ef

931215c5

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718"... · 8330bfd9

Tina Zhou authored 8 years ago

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252 -s ours" into lollipop-mr1-cts-dev am: 142da70e -s ours
am: 4af2cb0a -s ours

Change-Id: Ib7546e3bbb5e011404aeceae19dc41de9190e250

8330bfd9

Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability... · 98b52433

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252  -s ours am: 0ebc41e9  -s ours" into marshmallow-cts-dev am: 13d31cf7  -s ours" into nougat-cts-dev

98b52433

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718"... · d91383f0

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252  -s ours am: 0ebc41e9  -s ours am: b569b494  -s ours" into nougat-cts-dev

d91383f0

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718"... · 4db9c977

Tina Zhou authored 8 years ago

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252 -s ours am: 0ebc41e9 -s ours" into marshmallow-cts-dev
am: 13d31cf7 -s ours

Change-Id: Iabc95f510c914f70239b1064552acb8679adb0f6

4db9c977

Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into... · b2af327d

Tina Zhou authored 8 years ago

Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252 -s ours am: 0ebc41e9 -s ours
am: b569b494 -s ours

Change-Id: I379da2f18147a127c0722bfefc166a5cefd9f4a1

b2af327d

Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability... · 85c6bb85

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b65854  -s ours" into lollipop-mr1-cts-dev am: 34d44271  -s ours" into marshmallow-cts-dev am: 41b9bcac  -s ours" into nougat-cts-dev

85c6bb85

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718... · 55c213c1

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b65854  -s ours" into lollipop-mr1-cts-dev am: 34d44271  -s ours am: f1f200fd  -s ours" into nougat-cts-dev

55c213c1

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718... · 3eb28be9

Paul Duffin authored 8 years ago

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b65854 -s ours" into lollipop-mr1-cts-dev am: 34d44271 -s ours" into marshmallow-cts-dev
am: 41b9bcac -s ours

Change-Id: If6b67038ecf9c206fc570328c08a3d9b361ce5f2

3eb28be9

Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am:... · 8a1873d8

Paul Duffin authored 8 years ago

Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b65854 -s ours" into lollipop-mr1-cts-dev am: 34d44271 -s ours
am: f1f200fd -s ours

Change-Id: I8e50bc4af8047bd2dc8395f89d6a4586e754c4c4

8a1873d8

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718... · 6a6d51d3

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b65854  -s ours am: 557faae2  -s ours" into marshmallow-cts-dev am: 3f09914e  -s ours" into nougat-cts-dev

6a6d51d3

Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am:... · 361dcb44

Android Merger authored 8 years ago

Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b65854  -s ours am: 557faae2  -s ours am: cd0b8d74  -s ours" into nougat-cts-dev

361dcb44

Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am:... · 9fa3d822

Paul Duffin authored 8 years ago

Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b65854 -s ours am: 557faae2 -s ours" into marshmallow-cts-dev
am: 3f09914e -s ours

Change-Id: If4e37b19805ccc27010c8581357e732c3fdaf603

9fa3d822

DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: ... · 4afc3440

Paul Duffin authored 8 years ago

DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b65854  -s ours am: 557faae2  -s ours
am: cd0b8d74  -s ours

Change-Id: I71c6654843564189eaf6e079dfa1ba9481c433e2

4afc3440

Merge "Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain... · 90ca9b23

Android Merger authored 8 years ago

Merge "Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff  -s ours" into lollipop-mr1-cts-dev am: a1b430d8  -s ours" into marshmallow-cts-dev am: 2a9d9de7  -s ours" into nougat-cts-dev

90ca9b23

Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names."... · 4b14a4e0

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff  -s ours" into lollipop-mr1-cts-dev am: a1b430d8  -s ours am: 2b20489d  -s ours" into nougat-cts-dev

4b14a4e0

Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names."... · 81893469

Tina Zhou authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff -s ours" into lollipop-mr1-cts-dev am: a1b430d8 -s ours" into marshmallow-cts-dev
am: 2a9d9de7 -s ours

Change-Id: Ifde1573af928a9abfee33ed7e1b4b1552c9a830d

81893469

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into... · a7e9f27f

Tina Zhou authored 8 years ago

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff -s ours" into lollipop-mr1-cts-dev am: a1b430d8 -s ours
am: 2b20489d -s ours

Change-Id: I3949d2ee94d027ffb44c3fabba8d81a9c52eebfe

a7e9f27f

Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names."... · 20637ba3

Android Merger authored 8 years ago

Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff  -s ours am: df855148  -s ours" into marshmallow-cts-dev am: 78909a0a  -s ours" into nougat-cts-dev

20637ba3

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into... · f2faa4fc

Android Merger authored 8 years ago

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff  -s ours am: df855148  -s ours am: f52b0572  -s ours" into nougat-cts-dev

f2faa4fc