commit b08949151f8dfc7a72ea6696f2e6067c2b1643bb
author Jeffrey Vander Stoep <jeffv@google.com> Wed Oct 14 21:48:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 14 21:48:32 2015 +0000
tree 1ceaeed7888123f43d5522bdced3a698c34d2dd5
parent 05c0e092608401757f45a0a39bc2c0617e9ca0fe
parent 6b6d1a3076ad150365c31936b49a8277d476e4d8

am 6b6d1a30: am a2e511d6: am 8b626548: Merge "Pass privapp specifier for selinux labeling"

* commit '6b6d1a3076ad150365c31936b49a8277d476e4d8':
  Pass privapp specifier for selinux labeling

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

diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java
index 66170d4..5d8b1d2 100644
--- a/services/core/java/com/android/server/pm/SELinuxMMAC.java
+++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java
@@ -100,6 +100,9 @@
     private static final String SEAPP_HASH_FILE =
             Environment.getDataDirectory().toString() + "/system/seapp_hash";
 
+    // Append privapp to existing seinfo label
+    private static final String PRIVILEGED_APP_STR = ":privapp";
+
     /**
      * Load the mac_permissions.xml file containing all seinfo assignments used to
      * label apps. The loaded mac_permissions.xml file is determined by the
@@ -313,6 +316,9 @@
             }
         }
 
+        if (pkg.applicationInfo.isPrivilegedApp())
+            pkg.applicationInfo.seinfo += PRIVILEGED_APP_STR;
+
         if (DEBUG_POLICY_INSTALL) {
             Slog.i(TAG, "package (" + pkg.packageName + ") labeled with " +
                     "seinfo=" + pkg.applicationInfo.seinfo);