Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db32fb64 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps." 

* commit 'd172419e':
  Allow different SELinux policies for third party apps.
parents 1ed64c65 d172419e

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

+13 −23
Original line number Diff line number Diff line
@@ -346,15 +346,6 @@ public final class SELinuxMMAC { 
     */

    public static boolean assignSeinfoValue(PackageParser.Package pkg) {



        /*

         * Non system installed apps should be treated the same. This

         * means that any post-loaded apk will be assigned the default

         * tag, if one exists in the policy, else null, without respect

         * to the signing key.

         */

        if (((pkg.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) ||

            ((pkg.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0)) {



        // We just want one of the signatures to match.

        for (Signature s : pkg.mSignatures) {

            if (s == null)
@@ -373,7 +364,6 @@ public final class SELinuxMMAC { 
                }

            }

        }

        }



        // If we have a default seinfo value then great, otherwise

        // we set a null object and that is what we started with.