Snap for 8261185 from 7026055322cef1349b2cb8b82b4ac00df44d4306 to sc-qpr3-release (756d344e) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageParser.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -1401,11 +1401,9 @@ public class PackageParser {
		}
		SigningDetails verified;
		if (skipVerify) {
		// systemDir APKs are already trusted, save time by not verifying; since the signature
		// is not verified and some system apps can have their V2+ signatures stripped allow
		// pulling the certs from the jar signature.
		// systemDir APKs are already trusted, save time by not verifying
		verified = ApkSignatureVerifier.unsafeGetCertsWithoutVerification(
		apkPath, SigningDetails.SignatureSchemeVersion.JAR);
		apkPath, minSignatureScheme);
		} else {
		verified = ApkSignatureVerifier.verify(apkPath, minSignatureScheme);
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -3038,11 +3038,9 @@ public class ParsingPackageUtils {
		SigningDetails verified;
		try {
		if (skipVerify) {
		// systemDir APKs are already trusted, save time by not verifying; since the
		// signature is not verified and some system apps can have their V2+ signatures
		// stripped allow pulling the certs from the jar signature.
		// systemDir APKs are already trusted, save time by not verifying
		verified = ApkSignatureVerifier.unsafeGetCertsWithoutVerification(
		baseCodePath, SigningDetails.SignatureSchemeVersion.JAR);
		baseCodePath, minSignatureScheme);
		} else {
		verified = ApkSignatureVerifier.verify(baseCodePath, minSignatureScheme);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -693,7 +693,7 @@
		<string name="instant_apps_message_with_help" msgid="1816952263531203932">"Sovellus avattiin ilman asennusta. Katso lisätietoja napauttamalla."</string>
		<string name="app_info" msgid="5153758994129963243">"Sovelluksen tiedot"</string>
		<string name="go_to_web" msgid="636673528981366511">"Siirry selaimeen"</string>
		<string name="mobile_data" msgid="4564407557775397216">"Mobiilitiedonsiirto"</string>
		<string name="mobile_data" msgid="4564407557775397216">"Mobiilidata"</string>
		<string name="mobile_data_text_format" msgid="6806501540022589786">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
		<string name="mobile_carrier_text_format" msgid="8912204177152950766">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>, <xliff:g id="MOBILE_DATA_TYPE">%2$s</xliff:g>"</string>
		<string name="wifi_is_off" msgid="5389597396308001471">"Wi-Fi on pois päältä"</string>

+9 −11

Original line number	Diff line number	Diff line
		@@ -15193,9 +15193,8 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		// If the package is not on a system partition ensure it is signed with at least the
		// minimum signature scheme version required for its target SDK.
		if ((parseFlags & ParsingPackageUtils.PARSE_IS_SYSTEM_DIR) == 0) {
		// Ensure the package is signed with at least the minimum signature scheme version
		// required for its target SDK.
		int minSignatureSchemeVersion =
		ApkSignatureVerifier.getMinimumSignatureSchemeVersionForTargetSdk(
		pkg.getTargetSdkVersion());
		@@ -15206,7 +15205,6 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}
		}
		}

		@GuardedBy("mLock")
		private boolean addBuiltInSharedLibraryLocked(SystemConfig.SharedLibraryEntry entry) {

+2 −1

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ import android.annotation.Nullable;
		import android.content.Context;
		import android.content.pm.ActivityInfo;
		import android.content.res.Configuration;
		import android.graphics.Color;
		import android.graphics.Point;
		import android.graphics.Rect;
		import android.os.Debug;
		@@ -3563,7 +3564,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		private void setTaskBackgroundColor(@ColorInt int backgroundColor) {
		TaskDisplayArea taskDisplayArea = getTaskDisplayArea();

		if (taskDisplayArea != null) {
		if (taskDisplayArea != null && backgroundColor != Color.TRANSPARENT) {
		taskDisplayArea.setBackgroundColor(backgroundColor);

		// Atomic counter to make sure the clearColor callback is only called one.