Merge "Downgrade OOB warning of priv app to warning" into pi-dev (7d2c324c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -10355,7 +10355,7 @@ public class PackageManagerService extends IPackageManager.Stub

		if (Build.IS_DEBUGGABLE &&
		pkg.isPrivileged() &&
		!SystemProperties.getBoolean(PROPERTY_NAME_PM_DEXOPT_PRIV_APPS_OOB, true)) {
		SystemProperties.getBoolean(PROPERTY_NAME_PM_DEXOPT_PRIV_APPS_OOB, false)) {
		PackageManagerServiceUtils.logPackageHasUncompressedCode(pkg);
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -331,18 +331,18 @@ public class PackageManagerServiceUtils {
		ZipEntry entry = it.next();
		if (entry.getName().endsWith(".dex")) {
		if (entry.getMethod() != ZipEntry.STORED) {
		Slog.wtf(TAG, "APK " + fileName + " has compressed dex code " +
		Slog.w(TAG, "APK " + fileName + " has compressed dex code " +
		entry.getName());
		} else if ((entry.getDataOffset() & 0x3) != 0) {
		Slog.wtf(TAG, "APK " + fileName + " has unaligned dex code " +
		Slog.w(TAG, "APK " + fileName + " has unaligned dex code " +
		entry.getName());
		}
		} else if (entry.getName().endsWith(".so")) {
		if (entry.getMethod() != ZipEntry.STORED) {
		Slog.wtf(TAG, "APK " + fileName + " has compressed native code " +
		Slog.w(TAG, "APK " + fileName + " has compressed native code " +
		entry.getName());
		} else if ((entry.getDataOffset() & (0x1000 - 1)) != 0) {
		Slog.wtf(TAG, "APK " + fileName + " has unaligned native code " +
		Slog.w(TAG, "APK " + fileName + " has unaligned native code " +
		entry.getName());
		}
		}