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" am: 5755c2ad32

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760270

Change-Id: Ibb09f898195e4195e5e5235147d8ed0fccd644c9
This commit is contained in:
Bram Bonné
2021-07-09 12:49:31 +00:00
committed by Automerger Merge Worker
parent 09f0c84074 5755c2ad32
commit d21dfb5e81
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;
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());
}

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 {
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