Merge "Remove flag binary_transparency_sepolicy_hash" into main (6258b9ad) · Commits · e / os / android_frameworks_base

core/java/android/security/flags.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -51,13 +51,6 @@ flag {
		}
		}

		flag {
		name: "binary_transparency_sepolicy_hash"
		namespace: "hardware_backed_security"
		description: "Collect sepolicy hash from sysfs"
		bug: "308471499"
		}

		flag {
		name: "frp_enforcement"
		is_exported: true

+13 −16

Original line number	Diff line number	Diff line
		@@ -85,6 +85,8 @@ import com.android.internal.os.IBinaryTransparencyService;
		import com.android.internal.util.FrameworkStatsLog;
		import com.android.modules.expresslog.Histogram;
		import com.android.server.pm.ApexManager;
		import com.android.server.pm.BackgroundInstallControlCallbackHelper;
		import com.android.server.pm.BackgroundInstallControlService;
		import com.android.server.pm.pkg.AndroidPackage;
		import com.android.server.pm.pkg.AndroidPackageSplit;
		import com.android.server.pm.pkg.PackageState;
		@@ -101,9 +103,6 @@ import java.util.Map;
		import java.util.concurrent.Executors;
		import java.util.stream.Collectors;

		import com.android.server.pm.BackgroundInstallControlService;
		import com.android.server.pm.BackgroundInstallControlCallbackHelper;

		/**
		* @hide
		*/
		@@ -1577,7 +1576,6 @@ public class BinaryTransparencyService extends SystemService {
		Slog.d(TAG, String.format("VBMeta Digest: %s", mVbmetaDigest));
		FrameworkStatsLog.write(FrameworkStatsLog.VBMETA_DIGEST_REPORTED, mVbmetaDigest);

		if (android.security.Flags.binaryTransparencySepolicyHash()) {
		IoThread.getExecutor().execute(() -> {
		byte[] sepolicyHash = PackageUtils.computeSha256DigestForLargeFileAsBytes(
		"/sys/fs/selinux/policy", PackageUtils.createLargeFileBuffer());
		@@ -1590,7 +1588,6 @@ public class BinaryTransparencyService extends SystemService {
		sepolicyHashEncoded, mVbmetaDigest);
		});
		}
		}

		/**
		* Listen for APK updates.