Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Map SELINUX_LATEST_CHANGES to Build.CUR_DEVELOPMENT"

Browse Source
This commit is contained in:
Bram Bonné
2021-07-09 12:35:48 +00:00
committed by Gerrit Code Review
parent 9e3abef9b3 7ac9a05dbe
commit 5755c2ad32
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/SELinuxMMAC.java
View File

@@ -17,6 +17,7 @@
package com.android.server.pm; package com.android.server.pm;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.compat.annotation.Disabled;
import android.compat.annotation.EnabledAfter; import android.compat.annotation.EnabledAfter;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageParser.SigningDetails; import android.content.pm.PackageParser.SigningDetails;
@@ -79,13 +80,13 @@ public final class SELinuxMMAC {
/** /**
* Allows opt-in to the latest targetSdkVersion enforced changes without changing target SDK. * Allows opt-in to the latest targetSdkVersion enforced changes without changing target SDK.
* Turning this change off for an app targeting the latest SDK or higher is a no-op. * Turning this change on for an app targeting the latest SDK or higher is a no-op.
* *
* <p>Has no effect for apps using shared user id. * <p>Has no effect for apps using shared user id.
* *
* TODO(b/143539591): Update description with relevant SELINUX changes this opts in to. * TODO(b/143539591): Update description with relevant SELINUX changes this opts in to.
*/ */
@EnabledAfter(targetSdkVersion = android.os.Build.VERSION_CODES.R) @Disabled
@ChangeId @ChangeId
static final long SELINUX_LATEST_CHANGES = 143539591L; static final long SELINUX_LATEST_CHANGES = 143539591L;
@@ -364,7 +365,8 @@ public final class SELinuxMMAC {
} }
final ApplicationInfo appInfo = pkg.toAppInfoWithoutState(); final ApplicationInfo appInfo = pkg.toAppInfoWithoutState();
if (compatibility.isChangeEnabledInternal(SELINUX_LATEST_CHANGES, appInfo)) { if (compatibility.isChangeEnabledInternal(SELINUX_LATEST_CHANGES, appInfo)) {
return Math.max(android.os.Build.VERSION_CODES.S, pkg.getTargetSdkVersion()); return Math.max(
android.os.Build.VERSION_CODES.CUR_DEVELOPMENT, pkg.getTargetSdkVersion());
} else if (compatibility.isChangeEnabledInternal(SELINUX_R_CHANGES, appInfo)) { } else if (compatibility.isChangeEnabledInternal(SELINUX_R_CHANGES, appInfo)) {
return Math.max(android.os.Build.VERSION_CODES.R, pkg.getTargetSdkVersion()); return Math.max(android.os.Build.VERSION_CODES.R, pkg.getTargetSdkVersion());
} }

2
services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTest.java
View File

@@ -44,7 +44,7 @@ import org.mockito.junit.MockitoJUnitRunner;
public class SELinuxMMACTest { public class SELinuxMMACTest {
private static final String PACKAGE_NAME = "my.package"; private static final String PACKAGE_NAME = "my.package";
private static final int LATEST_OPT_IN_VERSION = Build.VERSION_CODES.S; private static final int LATEST_OPT_IN_VERSION = Build.VERSION_CODES.CUR_DEVELOPMENT;
private static final int R_OPT_IN_VERSION = Build.VERSION_CODES.R; private static final int R_OPT_IN_VERSION = Build.VERSION_CODES.R;
@Mock @Mock