diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 54a7e2a912ac1..ba2b37f676af7 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -10722,7 +10722,7 @@ public class PackageManagerService extends IPackageManager.Stub sharedUserSetting.isPrivileged() | pkg.isPrivileged() : pkg.isPrivileged(); pkg.applicationInfo.seInfo = SELinuxMMAC.getSeInfo(pkg, isPrivileged, - pkg.applicationInfo.targetSandboxVersion, targetSdkVersion); + targetSdkVersion); pkg.applicationInfo.seInfoUser = SELinuxUtil.assignSeinfoUser(pkgSetting.readUserState( userId == UserHandle.USER_ALL ? UserHandle.USER_SYSTEM : userId)); diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java index b4154c7476a1c..b94047e119d57 100644 --- a/services/core/java/com/android/server/pm/SELinuxMMAC.java +++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java @@ -69,9 +69,6 @@ public final class SELinuxMMAC { // Append privapp to existing seinfo label private static final String PRIVILEGED_APP_STR = ":privapp"; - // Append v2 to existing seinfo label - private static final String SANDBOX_V2_STR = ":v2"; - // Append targetSdkVersion=n to existing seinfo label where n is the app's targetSdkVersion private static final String TARGETSDKVERSION_STR = ":targetSdkVersion="; @@ -323,14 +320,13 @@ public final class SELinuxMMAC { * * @param pkg object representing the package to be labeled. * @param isPrivileged boolean. - * @param targetSandboxVersion int. * @param targetSdkVersion int. If this pkg runs as a sharedUser, targetSdkVersion is the * greater of: lowest targetSdk for all pkgs in the sharedUser, or * MINIMUM_TARGETSDKVERSION. * @return String representing the resulting seinfo. */ public static String getSeInfo(PackageParser.Package pkg, boolean isPrivileged, - int targetSandboxVersion, int targetSdkVersion) { + int targetSdkVersion) { String seInfo = null; synchronized (sPolicies) { if (!sPolicyRead) { @@ -351,10 +347,6 @@ public final class SELinuxMMAC { seInfo = DEFAULT_SEINFO; } - if (targetSandboxVersion == 2) { - seInfo += SANDBOX_V2_STR; - } - if (isPrivileged) { seInfo += PRIVILEGED_APP_STR; } diff --git a/services/core/java/com/android/server/pm/SharedUserSetting.java b/services/core/java/com/android/server/pm/SharedUserSetting.java index ca08415f7a777..cd7ded5ea2095 100644 --- a/services/core/java/com/android/server/pm/SharedUserSetting.java +++ b/services/core/java/com/android/server/pm/SharedUserSetting.java @@ -139,7 +139,7 @@ public final class SharedUserSetting extends SettingBase { for (PackageParser.Package pkg : pkgList) { final boolean isPrivileged = isPrivileged() | pkg.isPrivileged(); pkg.applicationInfo.seInfo = SELinuxMMAC.getSeInfo(pkg, isPrivileged, - pkg.applicationInfo.targetSandboxVersion, seInfoTargetSdkVersion); + seInfoTargetSdkVersion); } }