diff options
| author | Bram Bonné <brambonne@google.com> | 2021-07-09 12:35:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-07-09 12:35:48 +0000 |
| commit | 5755c2ad32a64026ac40b372bcaed13df675cad7 (patch) | |
| tree | 09ab3f5fb14484b2aef1593acb2e97d68ae28252 | |
| parent | 9e3abef9b33ae22969f493d4bdf008d188446adc (diff) | |
| parent | 7ac9a05dbe9fa7be060ccc2d320ab1f8b8403b53 (diff) | |
| download | base-5755c2ad32a64026ac40b372bcaed13df675cad7.tar.gz | |
Merge "Map SELINUX_LATEST_CHANGES to Build.CUR_DEVELOPMENT"
| -rw-r--r-- | services/core/java/com/android/server/pm/SELinuxMMAC.java | 8 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTest.java | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java index 4ba73688fa80..4a913e4edd71 100644 --- a/services/core/java/com/android/server/pm/SELinuxMMAC.java +++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java @@ -17,6 +17,7 @@ package com.android.server.pm; import android.compat.annotation.ChangeId; +import android.compat.annotation.Disabled; import android.compat.annotation.EnabledAfter; import android.content.pm.ApplicationInfo; 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. - * 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. * * TODO(b/143539591): Update description with relevant SELINUX changes this opts in to. */ - @EnabledAfter(targetSdkVersion = android.os.Build.VERSION_CODES.R) + @Disabled @ChangeId static final long SELINUX_LATEST_CHANGES = 143539591L; @@ -364,7 +365,8 @@ public final class SELinuxMMAC { } final ApplicationInfo appInfo = pkg.toAppInfoWithoutState(); 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)) { return Math.max(android.os.Build.VERSION_CODES.R, pkg.getTargetSdkVersion()); } diff --git a/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTest.java b/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTest.java index cee4cda99e46..901b200417c9 100644 --- a/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTest.java @@ -44,7 +44,7 @@ import org.mockito.junit.MockitoJUnitRunner; public class SELinuxMMACTest { 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; @Mock |