From fbeda34efd4009e43aee069b29b4f740219a7b9b Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Thu, 18 Oct 2018 15:47:19 +0800 Subject: [PATCH] pm: ignore restorecon failure On the 9p filesystem, restorecon won't work. It causes apk can't be installed. Just ignore the errors to workaround it. --- services/core/java/com/android/server/pm/PackageInstallerService.java | 2 +- services/core/java/com/android/server/pm/PackageManagerService.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 1fa37b91b8e8..ee246ec34977 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -663,7 +663,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub { } if (!SELinux.restorecon(stageDir)) { - throw new IOException("Failed to restorecon session dir: " + stageDir); + Slog.e(TAG, "Failed to restorecon session dir: " + stageDir); } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index d6b572835950..b37f56a69799 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -16996,7 +16996,6 @@ public class PackageManagerService extends IPackageManager.Stub if (!SELinux.restoreconRecursive(afterCodeFile)) { Slog.w(TAG, "Failed to restorecon"); - return false; } // Reflect the rename internally -- 2.11.0