From 2b57ece6308010a7af0902579c0905f32403c5c7 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Thu, 17 Sep 2020 22:24:17 -0700
Subject: Allow APK signature scheme v1 for API 30+ apps

F-Droid is currently building app packages with v1 signatures, even if
they target API 30 or newer.

Change-Id: I42180acc3b3fb28f073f4c19c2cffb44cba4f221
---
 core/java/android/util/apk/ApkSignatureVerifier.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/java/android/util/apk/ApkSignatureVerifier.java b/core/java/android/util/apk/ApkSignatureVerifier.java
index 36d97af6fb0d..d8ca7d85a6bd 100644
--- a/core/java/android/util/apk/ApkSignatureVerifier.java
+++ b/core/java/android/util/apk/ApkSignatureVerifier.java
@@ -596,9 +596,6 @@ public class ApkSignatureVerifier {
      * {@code targetSdk}.
      */
     public static int getMinimumSignatureSchemeVersionForTargetSdk(int targetSdk) {
-        if (targetSdk >= Build.VERSION_CODES.R) {
-            return SignatureSchemeVersion.SIGNING_BLOCK_V2;
-        }
         return SignatureSchemeVersion.JAR;
     }
 
-- 
cgit v1.2.3