diff options
23 files changed, 74 insertions, 39 deletions
diff --git a/sdksandbox/tests/cts/endtoendtests/AndroidManifest.xml b/sdksandbox/tests/cts/endtoendtests/AndroidManifest.xml index 61ca94e414..1318650d57 100644 --- a/sdksandbox/tests/cts/endtoendtests/AndroidManifest.xml +++ b/sdksandbox/tests/cts/endtoendtests/AndroidManifest.xml @@ -24,22 +24,22 @@ <uses-library android:name="android.test.runner" /> <uses-sdk-library android:name="com.android.loadSdkSuccessfullySdkProvider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> <uses-sdk-library android:name="com.android.retryLoadSameSdkShouldFailSdkProvider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> <uses-sdk-library android:name="com.android.loadSdkWithInternalErrorSdkProvider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> <uses-sdk-library android:name="com.android.requestSurfacePackageSuccessfullySdkProvider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> <uses-sdk-library android:name="com.android.requestSurfacePackageWithInternalErrorSdkProvider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> <uses-sdk-library android:name="com.android.codeproviderresources" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> </application> <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" diff --git a/sdksandbox/tests/cts/endtoendtests/providers/loadSdkSuccessfully/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/loadSdkSuccessfully/Android.bp index b88d334ba5..cae04648db 100644 --- a/sdksandbox/tests/cts/endtoendtests/providers/loadSdkSuccessfully/Android.bp +++ b/sdksandbox/tests/cts/endtoendtests/providers/loadSdkSuccessfully/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "LoadSdkSuccessfullySdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/cts/endtoendtests/providers/loadSdkWithInternalError/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/loadSdkWithInternalError/Android.bp index 01355f833f..ec948a6f95 100644 --- a/sdksandbox/tests/cts/endtoendtests/providers/loadSdkWithInternalError/Android.bp +++ b/sdksandbox/tests/cts/endtoendtests/providers/loadSdkWithInternalError/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "LoadSdkWithInternalErrorSdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageSuccessfully/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageSuccessfully/Android.bp index 0d924dfd78..4b0b7f9814 100644 --- a/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageSuccessfully/Android.bp +++ b/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageSuccessfully/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "RequestSurfacePackageSuccessfullySdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageWithInternalError/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageWithInternalError/Android.bp index 6f4019f657..9a7a221172 100644 --- a/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageWithInternalError/Android.bp +++ b/sdksandbox/tests/cts/endtoendtests/providers/requestSurfacePackageWithInternalError/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "RequestSurfacePackageWithInternalErrorSdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/cts/endtoendtests/providers/retryLoadSameSdkShouldFail/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/retryLoadSameSdkShouldFail/Android.bp index 12dbd1d615..6c16bb6004 100644 --- a/sdksandbox/tests/cts/endtoendtests/providers/retryLoadSameSdkShouldFail/Android.bp +++ b/sdksandbox/tests/cts/endtoendtests/providers/retryLoadSameSdkShouldFail/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "RetryLoadSameSdkShouldFailSdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/hostsidetests/Android.bp b/sdksandbox/tests/hostsidetests/Android.bp index a38375de39..0ac80eb55c 100644 --- a/sdksandbox/tests/hostsidetests/Android.bp +++ b/sdksandbox/tests/hostsidetests/Android.bp @@ -105,8 +105,7 @@ android_test_helper_app { name: "TestCodeProvider", manifest: "codeprovider/TestCodeProviderManifest.xml", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "codeprovider/src/**/TestSandboxedSdkProvider.java", ":framework-sdksandbox-sources", @@ -117,8 +116,7 @@ android_test_helper_app { android_test_helper_app { name: "TestCodeProvider2", manifest: "codeprovider/TestCodeProvider2Manifest.xml", - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", defaults: ["platform_app_defaults"], srcs: [ "codeprovider/src/**/TestSandboxedSdkProvider2.java", diff --git a/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/Android.bp b/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/Android.bp index 94de689e99..82c51fb761 100644 --- a/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/Android.bp +++ b/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/Android.bp @@ -76,6 +76,5 @@ android_test_helper_app { ":framework-sdksandbox-sources", ], platform_apis: true, - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", } diff --git a/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/app/SdkSandboxStorageTestAppManifest.xml b/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/app/SdkSandboxStorageTestAppManifest.xml index c05553aa96..1d15a793c7 100644 --- a/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/app/SdkSandboxStorageTestAppManifest.xml +++ b/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/app/SdkSandboxStorageTestAppManifest.xml @@ -26,7 +26,7 @@ <uses-library android:name="android.test.runner" /> <uses-sdk-library android:name="com.android.tests.codeprovider.storagetest" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> </application> diff --git a/sdksandbox/tests/hostsidetests/app/SdkSandboxTestApp2Manifest.xml b/sdksandbox/tests/hostsidetests/app/SdkSandboxTestApp2Manifest.xml index b68afbb737..9ce3aaa85c 100644 --- a/sdksandbox/tests/hostsidetests/app/SdkSandboxTestApp2Manifest.xml +++ b/sdksandbox/tests/hostsidetests/app/SdkSandboxTestApp2Manifest.xml @@ -32,7 +32,7 @@ <uses-sdk-library android:name="com.android.testcode2" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> </application> diff --git a/sdksandbox/tests/hostsidetests/app/SdkSandboxTestAppManifest.xml b/sdksandbox/tests/hostsidetests/app/SdkSandboxTestAppManifest.xml index 01aa2abd11..db9edea194 100644 --- a/sdksandbox/tests/hostsidetests/app/SdkSandboxTestAppManifest.xml +++ b/sdksandbox/tests/hostsidetests/app/SdkSandboxTestAppManifest.xml @@ -31,7 +31,7 @@ <uses-sdk-library android:name="com.android.testcode" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> </application> diff --git a/sdksandbox/tests/hostsidetests/app/SdkSandboxTestDebuggableAppManifest.xml b/sdksandbox/tests/hostsidetests/app/SdkSandboxTestDebuggableAppManifest.xml index 3e99edb145..00c0188b0c 100644 --- a/sdksandbox/tests/hostsidetests/app/SdkSandboxTestDebuggableAppManifest.xml +++ b/sdksandbox/tests/hostsidetests/app/SdkSandboxTestDebuggableAppManifest.xml @@ -31,7 +31,7 @@ <uses-sdk-library android:name="com.android.testcode" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> </application> diff --git a/sdksandbox/tests/keys/Android.bp b/sdksandbox/tests/keys/Android.bp new file mode 100644 index 0000000000..e7ed4027ed --- /dev/null +++ b/sdksandbox/tests/keys/Android.bp @@ -0,0 +1,22 @@ +// Copyright (C) 2022 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +android_app_certificate { + name: "sdksandbox-test", + certificate: "sdksandbox-test", +}
\ No newline at end of file diff --git a/sdksandbox/tests/keys/sdksandbox-test.pk8 b/sdksandbox/tests/keys/sdksandbox-test.pk8 Binary files differnew file mode 100644 index 0000000000..f1e5c7a173 --- /dev/null +++ b/sdksandbox/tests/keys/sdksandbox-test.pk8 diff --git a/sdksandbox/tests/keys/sdksandbox-test.x509.pem b/sdksandbox/tests/keys/sdksandbox-test.x509.pem new file mode 100644 index 0000000000..7dce9be9e1 --- /dev/null +++ b/sdksandbox/tests/keys/sdksandbox-test.x509.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEKzCCAxOgAwIBAgIUDNuVw/GcentdUmIy0lDUJ1KUigAwDQYJKoZIhvcNAQEL +BQAwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRQwEgYDVQQH +DAtTYW4gTmFyY2lzbzEXMBUGA1UECgwOWW95b2R5bmUsIEluYy4xGjAYBgNVBAsM +EVlveW9keW5lIE1vYmlsaXR5MREwDwYDVQQDDAhZb3lvZHluZTEjMCEGCSqGSIb3 +DQEJARYUeW95b2R5bmVAZXhhbXBsZS5jb20wHhcNMjIwNTE3MTE0MTQ3WhcNNDkx +MDAyMTE0MTQ3WjCBpTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +FDASBgNVBAcMC1NhbiBOYXJjaXNvMRcwFQYDVQQKDA5Zb3lvZHluZSwgSW5jLjEa +MBgGA1UECwwRWW95b2R5bmUgTW9iaWxpdHkxETAPBgNVBAMMCFlveW9keW5lMSMw +IQYJKoZIhvcNAQkBFhR5b3lvZHluZUBleGFtcGxlLmNvbTCCASAwDQYJKoZIhvcN +AQEBBQADggENADCCAQgCggEBAK1lLi5OEj/zOU+XVPfWL1Yo+aaYUmP2iQ/t1au4 +FCoT82uh0V1Fyp5SNonYM4osuik3jxwvMOiMhfJA5iFnjsnaA8iwA8CMCHv1BioI +xSRG1XQCzmtArRDZMY1U8NS5Tj1GK8mWo8/dvAgjjCi0qhc2JBcNQ+5NYigJaY57 +QguN4OOJ0a8yRb6hMsKompD9z35aqE/pCMWaZ/o3RDMManJXx2aWJIvZ81B0MQVN +PFuVxgXIWizhXXKGkRSLO757lFkF9AG9p0zou87OlrQS/umZlwi5UUDv8/otADCT +zoVCnmjwHWPj2mL2dHQcIX/o4gIa2PzT27Va+gcFv12lk6sCAQOjUzBRMB0GA1Ud +DgQWBBQDIWPr4B/X+DhJr23bXKBp0KkW6DAfBgNVHSMEGDAWgBQDIWPr4B/X+DhJ +r23bXKBp0KkW6DAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA6 +cOcYLjqDVi0J+3ACpvtBmm3JqlemC/VMMg1cgngiGXzD0XZgjbIIbvWxYwk1puCo +fnVR1rvBDri+dVREuXNgVZdRY27yhd/gYVha1+ivgdnJY2vdGMCEvP12I8IL9uFx +ncPU4R0mom9sWBoSf8tz5RocG3NrEa5MzH2c+5+MHNYgV2LjFc5Z7ETsZv53fOev +lzJTF/wk0GIywL+PZKt6PI9ISVFiyzC9jqGrB33GZn859hcX7szPiRc8nhcDvsqM +JZ8lcR1tVSdfnVNtp7t18X2doAng/NX7wDyJKNZFrwwiljc/Ay48xUM9xiBLK+Zo +8wsvBGXrKxYmANsVbpMF +-----END CERTIFICATE----- diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_Client1.xml b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_Client1.xml index cbd2027404..9d23624839 100644 --- a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_Client1.xml +++ b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_Client1.xml @@ -31,6 +31,6 @@ </activity> <uses-sdk-library android:name="com.android.sdksandboxcode" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> </application> </manifest> diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_Client2.xml b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_Client2.xml index 47665b267b..6aef7a0e89 100644 --- a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_Client2.xml +++ b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_Client2.xml @@ -31,6 +31,6 @@ </activity> <uses-sdk-library android:name="com.android.sdksandboxcode" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> </application> </manifest> diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_WebViewClient.xml b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_WebViewClient.xml index b6dd7583a0..a9810df2d6 100644 --- a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_WebViewClient.xml +++ b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/AndroidManifest_WebViewClient.xml @@ -31,6 +31,6 @@ </activity> <uses-sdk-library android:name="com.android.sdksandboxcode" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> </application> </manifest> diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp b/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp index 300c707a0a..a1b6d6470b 100644 --- a/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp +++ b/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "SdkSandboxCodeProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/sdksandboxcode_1/*.java", ], @@ -32,8 +31,7 @@ android_test_helper_app { android_test_helper_app { name: "SdkSandboxWebViewProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/sdksandboxcode_webview/*.java", ], diff --git a/sdksandbox/tests/test-apps/CodeProviderWithResources/Android.bp b/sdksandbox/tests/test-apps/CodeProviderWithResources/Android.bp index b2acd21706..d6309c8c49 100644 --- a/sdksandbox/tests/test-apps/CodeProviderWithResources/Android.bp +++ b/sdksandbox/tests/test-apps/CodeProviderWithResources/Android.bp @@ -19,7 +19,7 @@ package { android_test_helper_app { name: "CodeProviderWithResources", defaults: ["platform_app_defaults"], - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/test-apps/FailingSdkProvider/Android.bp b/sdksandbox/tests/test-apps/FailingSdkProvider/Android.bp index 3cfa68a128..279ff255b8 100644 --- a/sdksandbox/tests/test-apps/FailingSdkProvider/Android.bp +++ b/sdksandbox/tests/test-apps/FailingSdkProvider/Android.bp @@ -19,8 +19,7 @@ package { android_test_helper_app { name: "FailingSdkProvider", defaults: ["platform_app_defaults"], - // TODO(b/215372846): Create our own signing key. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", srcs: [ "src/**/*.java", ], diff --git a/sdksandbox/tests/test-apps/code-provider-app/Android.bp b/sdksandbox/tests/test-apps/code-provider-app/Android.bp index fd52c8726e..79d10c1c93 100644 --- a/sdksandbox/tests/test-apps/code-provider-app/Android.bp +++ b/sdksandbox/tests/test-apps/code-provider-app/Android.bp @@ -18,8 +18,7 @@ package { android_test_helper_app { name: "SampleCodeProviderApp", - // TODO(b/215372846): Create specific signing keys for SupplementalProcess tests. - certificate: ":cts-keyset-test-b", + certificate: ":sdksandbox-test", defaults: ["platform_app_defaults"], manifest: "AndroidManifest.xml", sdk_version: "current", diff --git a/sdksandbox/tests/unittest/AndroidManifest.xml b/sdksandbox/tests/unittest/AndroidManifest.xml index a75981361d..d4adfeee0a 100644 --- a/sdksandbox/tests/unittest/AndroidManifest.xml +++ b/sdksandbox/tests/unittest/AndroidManifest.xml @@ -21,7 +21,7 @@ <application android:debuggable="true"> <uses-library android:name="android.test.runner" /> <uses-sdk-library android:name="com.android.codeprovider" android:versionMajor="1" - android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5" /> + android:certDigest="0B:44:2D:88:FA:A7:B3:AD:23:8D:DE:29:8A:A1:9B:D5:62:03:92:0B:BF:D8:D3:EB:C8:99:33:2C:8E:E1:15:99" /> </application> <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" |