提交: 0b67139d52ddb0977ae3fe3dcbda3f2f56137c17 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修訂: 0b67139d52ddb0977ae3fe3dcbda3f2f56137c17 (tree)
• 時間: 2020-04-14 23:46:54
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

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.

Change Summary

• modified: services/core/java/com/android/server/pm/PackageInstallerService.java
• modified: services/core/java/com/android/server/pm/PackageManagerService.java

差異

--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -754,7 +754,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
         }
 
         if (!SELinux.restorecon(stageDir)) {
-            throw new IOException("Failed to restorecon session dir: " + stageDir);
+            Slog.e(TAG, "Failed to restorecon session dir: " + stageDir);
         }
     }
 

--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -15811,7 +15811,6 @@ public class PackageManagerService extends IPackageManager.Stub
 
             if (!SELinux.restoreconRecursive(afterCodeFile)) {
                 Slog.w(TAG, "Failed to restorecon");
-                return false;
             }
 
             // Reflect the rename internally