Merge "Fix getKeySetByAlias PackageMgr test." (66623fb2) · Commits · e / os / android_frameworks_base

core/tests/coretests/apks/keyset/api_test/AndroidManifest.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -17,4 +17,11 @@
		package="com.android.frameworks.coretests.keysets_api">
		<application android:hasCode="false">
		</application>
		<key-sets>
		<key-set android:name="A" >
		<public-key android:name="keyA"
		android:value="MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJoN1Nsgqf0V4C/bbN8wo8O2X/S5D76+5Mb9mlIsHkUTUTbHCNk+LxHIUYLm89YbP9zImrV0bUHLUAZUyoMUCiMCAwEAAQ=="/>
		</key-set>
		</key-sets>

		</manifest>

+7 −5

Original line number	Diff line number	Diff line
		@@ -3278,7 +3278,6 @@ public class PackageManagerTests extends AndroidTestCase {
		* testGetKeySetByAlias - same as getSigningKeySet, but for keysets defined
		* by this package.
		*/
		@Suppress
		public void testGetKeySetByAlias() throws Exception {
		PackageManager pm = getPm();
		String mPkgName = mContext.getPackageName();
		@@ -3309,17 +3308,20 @@ public class PackageManagerTests extends AndroidTestCase {
		assertTrue(false); // should have thrown
		} catch(IllegalArgumentException e) {
		}

		// make sure we can get a KeySet from our pkg
		ks = pm.getKeySetByAlias(mPkgName, "A");
		assertNotNull(ks);

		// and another
		final InstallParams ip = installFromRawResource("keysetApi.apk", R.raw.keyset_splat_api,
		0, false, false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
		try {
		ks = pm.getKeySetByAlias(otherPkgName, "A");
		assertTrue(false); // should have thrown
		} catch (SecurityException e) {
		assertNotNull(ks);
		} finally {
		cleanUpInstall(ip);
		}
		ks = pm.getKeySetByAlias(mPkgName, "A");
		assertNotNull(ks);
		}

		public void testIsSignedBy() throws Exception {