diff options
| author | 2018-03-27 17:04:01 +0000 | |
|---|---|---|
| committer | 2018-03-27 17:04:01 +0000 | |
| commit | 7d2c324cc7f45e6679c6c575d6d796368b242a3e (patch) | |
| tree | dcc6b5a1f6d9f49bfacd908ee8abf61d4000a5c2 | |
| parent | 02175b78479af9534c89470675c9c36277ee8bdd (diff) | |
| parent | b5a564a05645cd95ba9833b0fa804cd98f192c6b (diff) | |
Merge "Downgrade OOB warning of priv app to warning" into pi-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 2 | ||||
| -rw-r--r-- | services/core/java/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 950d8dfc28fb..5a63f2963ccf 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 5060c4df655e..853081a5c119 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()); } } |