From cc831ac694d742dd4f311650bc3c9373c4ba518b Mon Sep 17 00:00:00 2001
From: quh4gko8 <88831734+quh4gko8@users.noreply.github.com>
Date: Tue, 1 Oct 2024 08:17:48 +0000
Subject: [PATCH] Revert "Override OEM unlock check with downstream security
 state flag whenever it is present"

This reverts commit ece40a40790b9d80944c0c1d3c915e0f435c4553.
---
 .../java/app/attestation/auditor/AttestationProtocol.java  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/src/main/java/app/attestation/auditor/AttestationProtocol.java b/app/src/main/java/app/attestation/auditor/AttestationProtocol.java
index e79df0ef..26b8e41f 100644
--- a/app/src/main/java/app/attestation/auditor/AttestationProtocol.java
+++ b/app/src/main/java/app/attestation/auditor/AttestationProtocol.java
@@ -1626,13 +1626,6 @@ static AttestationResult generateSerialized(final Context context, final byte[]
                 osEnforcedFlags |= OS_ENFORCED_FLAGS_SYSTEM_USER;
             }
             if (extraSecurityState != Bundle.EMPTY) {
-                String oemUnlockAllowedKey = "android.ext.OEM_UNLOCK_ALLOWED";
-                if (extraSecurityState.containsKey(oemUnlockAllowedKey)) {
-                    osEnforcedFlags &= ~OS_ENFORCED_FLAGS_OEM_UNLOCK_ALLOWED;
-                    if (extraSecurityState.getBoolean(oemUnlockAllowedKey, false)) {
-                        osEnforcedFlags |= OS_ENFORCED_FLAGS_OEM_UNLOCK_ALLOWED;
-                    }
-                }
             }
             serializer.putInt(osEnforcedFlags);