From b5a564a05645cd95ba9833b0fa804cd98f192c6b Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Tue, 27 Mar 2018 07:22:32 -0700 Subject: [PATCH] Downgrade OOB warning of priv app to warning We can't enforce priv apps to uncompress .dex and .so just yet until all priv apps from Play have done so. Also fix the wrong default value. Test: build Bug: 76440172 Bug: 63920015 Change-Id: I98ab7272702c1693752f8e4ecb53e1b1eb5e1f35 --- .../java/com/android/server/pm/PackageManagerService.java | 2 +- .../com/android/server/pm/PackageManagerServiceUtils.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 950d8dfc28fb6..5a63f2963ccf6 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -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); } diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java index 5060c4df655ef..853081a5c119e 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java @@ -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()); } }