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

Commit f8cefed9 authored by Michael Peck's avatar Michael Peck Committed by android-build-merger
Browse files

Merge "Pass targetSdkVersion specifier for SELinux labeling" 

am: 4516240b

Change-Id: Ic61c4dc30f075d01a85d8b60cfe4ae1de773aa09
parents 6c1ac4dd 4516240b

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

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ public final class SELinuxMMAC { 
    // Append autoplay to existing seinfo label

    private static final String AUTOPLAY_APP_STR = ":autoplayapp";



    // Append targetSdkVersion=n to existing seinfo label where n is the app's targetSdkVersion

    private static final String TARGETSDKVERSION_STR = ":targetSdkVersion=";



    /**

     * Load the mac_permissions.xml file containing all seinfo assignments used to

     * label apps. The loaded mac_permissions.xml file is determined by the
@@ -290,6 +293,8 @@ public final class SELinuxMMAC { 
        if (pkg.applicationInfo.isPrivilegedApp())

            pkg.applicationInfo.seinfo += PRIVILEGED_APP_STR;



        pkg.applicationInfo.seinfo += TARGETSDKVERSION_STR + pkg.applicationInfo.targetSdkVersion;



        if (DEBUG_POLICY_INSTALL) {

            Slog.i(TAG, "package (" + pkg.packageName + ") labeled with " +

                    "seinfo=" + pkg.applicationInfo.seinfo);