diff options
Diffstat (limited to 'core/tests/coretests/apks')
5 files changed, 47 insertions, 41 deletions
diff --git a/core/tests/coretests/apks/keyset/permUse/AndroidManifest.xml b/core/tests/coretests/apks/keyset/permUse/AndroidManifest.xml index 41a2974..b7645b0 100644 --- a/core/tests/coretests/apks/keyset/permUse/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/permUse/AndroidManifest.xml @@ -18,14 +18,16 @@ <application android:hasCode="false"> </application> <uses-permission android:name="com.android.frameworks.coretests.keysets_permdef.keyset_perm" /> - <keys> - <publicKey android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="> - <keyset android:name="A" /> - </publicKey> - <publicKey android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ=="> - <keyset android:name="B" /> - </publicKey> - </keys> - <upgrade-keyset android:name="A"/> - <upgrade-keyset android:name="B"/> + <key-sets> + <key-set android:name="A"> + <public-key android:name="keyA" + android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="/> + </key-set> + <key-set android:name="B"> + <public-key android:name="keyB" + android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ==" /> + </key-set> + <upgrade-key-set android:name="A"/> + <upgrade-key-set android:name="B"/> + </key-sets> </manifest> diff --git a/core/tests/coretests/apks/keyset/uA/AndroidManifest.xml b/core/tests/coretests/apks/keyset/uA/AndroidManifest.xml index 87c420e..f31b75f 100644 --- a/core/tests/coretests/apks/keyset/uA/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/uA/AndroidManifest.xml @@ -17,10 +17,11 @@ package="com.android.frameworks.coretests.keysets"> <application android:hasCode="false"> </application> - <keys> - <publicKey android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="> - <keyset android:name="A" /> - </publicKey> - </keys> - <upgrade-keyset android:name="A"/> + <key-sets> + <key-set android:name="A" > + <public-key android:name="keyA" + android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="/> + </key-set> + <upgrade-key-set android:name="A"/> + </key-sets> </manifest> diff --git a/core/tests/coretests/apks/keyset/uAB/AndroidManifest.xml b/core/tests/coretests/apks/keyset/uAB/AndroidManifest.xml index a65f085..8ad3471 100644 --- a/core/tests/coretests/apks/keyset/uAB/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/uAB/AndroidManifest.xml @@ -17,13 +17,13 @@ package="com.android.frameworks.coretests.keysets"> <application android:hasCode="false"> </application> - <keys> - <publicKey android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="> - <keyset android:name="AB" /> - </publicKey> - <publicKey android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ=="> - <keyset android:name="AB" /> - </publicKey> - </keys> - <upgrade-keyset android:name="AB"/> + <key-sets> + <key-set android:name="AB" > + <public-key android:name="keyA" + android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ==" /> + <public-key android:name="keyB" + android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ==" /> + </key-set> + <upgrade-key-set android:name="AB"/> + </key-sets> </manifest> diff --git a/core/tests/coretests/apks/keyset/uAuB/AndroidManifest.xml b/core/tests/coretests/apks/keyset/uAuB/AndroidManifest.xml index 5b0b864..cdbd639 100644 --- a/core/tests/coretests/apks/keyset/uAuB/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/uAuB/AndroidManifest.xml @@ -17,14 +17,16 @@ package="com.android.frameworks.coretests.keysets"> <application android:hasCode="false"> </application> - <keys> - <publicKey android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="> - <keyset android:name="A" /> - </publicKey> - <publicKey android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ=="> - <keyset android:name="B" /> - </publicKey> - </keys> - <upgrade-keyset android:name="A"/> - <upgrade-keyset android:name="B"/> + <key-sets> + <key-set android:name="A" > + <public-key android:name="keyA" + android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ==" /> + </key-set> + <key-set android:name="B" > + <public-key android:name="keyB" + android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ==" /> + </key-set> + <upgrade-key-set android:name="A"/> + <upgrade-key-set android:name="B"/> + </key-sets> </manifest> diff --git a/core/tests/coretests/apks/keyset/uB/AndroidManifest.xml b/core/tests/coretests/apks/keyset/uB/AndroidManifest.xml index 9b89961..61063c3 100644 --- a/core/tests/coretests/apks/keyset/uB/AndroidManifest.xml +++ b/core/tests/coretests/apks/keyset/uB/AndroidManifest.xml @@ -17,10 +17,11 @@ package="com.android.frameworks.coretests.keysets"> <application android:hasCode="false"> </application> - <keys> - <publicKey android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ=="> - <keyset android:name="B" /> - </publicKey> - </keys> - <upgrade-keyset android:name="B"/> + <key-sets> + <key-set android:name="B" > + <public-key android:name="keyB" + android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMTfQsY8UuXiXmvw/y7Tpr7HoyfAC0nE/8Qdk3ZtEr9asa5qqP0F6xzCI1PGVFV+WLVRwm6FdB9StENL5EKyQFcCAwEAAQ==" /> + </key-set> + <upgrade-key-set android:name="B"/> + </key-sets> </manifest> |