Deprecate WebAPK KitKat support part 3

BUG=1068178

Change-Id: I6f7f3c6e77a7aae2b3d3171ad193f0b703beee42
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2164570
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Glenn Hartmann <hartmanng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#763993}

chrome/android/java/src/org/chromium/chrome/browser/metrics/WebApkUma.java

@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.metrics;
 
 import android.content.ContentResolver;
-import android.os.Build;
 import android.os.Environment;
 import android.os.StatFs;
 import android.provider.Settings;
@@ -349,13 +348,7 @@ public class WebApkUma {
         long partitionTotalBytes = partitionStats.getTotalBytes();
         long minimumFreeBytes = getLowSpaceLimitBytes(partitionTotalBytes);
 
-        long webApkExtraSpaceBytes = 0;
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            // Extra installation space is only allowed >= Android L
-            webApkExtraSpaceBytes = WEBAPK_EXTRA_INSTALLATION_SPACE_BYTES;
-        }
-
+        long webApkExtraSpaceBytes = WEBAPK_EXTRA_INSTALLATION_SPACE_BYTES;
         return partitionAvailableBytes - minimumFreeBytes + webApkExtraSpaceBytes;
     }
 

chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/DexOptimizer.java

@@ -101,10 +101,8 @@ public class DexOptimizer {
             if (currentApiVersion >= Build.VERSION_CODES.M) {
                 return new File(
                         dexPath.getParentFile(), "oat/" + VMRuntime.getCurrentInstructionSet());
-            } else if (currentApiVersion >= Build.VERSION_CODES.LOLLIPOP) {
-                return new File(dexPath.getParentFile(), VMRuntime.getCurrentInstructionSet());
             } else {
-                return dexPath.getParentFile();
+                return new File(dexPath.getParentFile(), VMRuntime.getCurrentInstructionSet());
             }
         } catch (NoSuchMethodException e) {
             return null;

chrome/android/webapk/shell_apk/AndroidManifest.xml

@@ -23,7 +23,7 @@
     {{{raw_manifest_tags}}}
 
     <uses-sdk
-        android:minSdkVersion="19"
+        android:minSdkVersion="21"
         android:targetSdkVersion="29" />
 
     <application

chrome/android/webapk/shell_apk/BUILD.gn

@@ -76,7 +76,7 @@ template("webapk_java") {
       "//chrome/android/webapk/libs/common:common_java",
       "//chrome/android/webapk/libs/common:splash_java",
     ]
-    min_sdk_version = 19
+    min_sdk_version = 21
   }
 }
 
@@ -93,7 +93,7 @@ template("webapk_with_service_java") {
       "src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java",
     ]
     deps += [ ":compiled_in_runtime_library_java" ]
-    min_sdk_version = 19
+    min_sdk_version = 21
   }
 }
 
@@ -248,7 +248,7 @@ template("webapk_tmpl") {
 
     android_manifest = _manifest_output
     android_manifest_dep = ":$_manifest_target_name"
-    min_sdk_version = 19
+    min_sdk_version = 21
     target_sdk_version = 29
     never_incremental = true
     enable_multidex = false

chrome/android/webapk/shell_apk/current_version/current_version.gni

@@ -12,4 +12,4 @@
 # //chrome/android/webapk/shell_apk:webapk is changed. This includes
 # Java files, Android resource files and AndroidManifest.xml. Does not affect
 # Chrome.apk
-current_shell_apk_version = 125
+current_shell_apk_version = 126

chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/WebApkUtils.java

@@ -220,12 +220,7 @@ public class WebApkUtils {
             return null;
         }
         try {
-            Drawable drawable = null;
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                drawable = resources.getDrawable(resourceId, null);
-            } else {
-                drawable = resources.getDrawable(resourceId);
-            }
+            Drawable drawable = resources.getDrawable(resourceId, null);
             return drawable != null ? ((BitmapDrawable) drawable).getBitmap() : null;
         } catch (Resources.NotFoundException e) {
             return null;
@@ -255,8 +250,6 @@ public class WebApkUtils {
      * @see android.view.Window#setStatusBarColor(int color).
      */
     public static void setStatusBarColor(Window window, int statusBarColor) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
-
         window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
         window.setStatusBarColor(statusBarColor);
     }