From b78509129b8028a0cfae95eb20828ef94e74eb49 Mon Sep 17 00:00:00 2001
From: "Torne (Richard Coles)" <torne@google.com>
Date: Mon, 7 Oct 2024 14:09:15 -0400
Subject: [PATCH] Clean up android.webkit.update_service_v2.

This flag shipped in V and can now be cleaned up.

Bug: 356086806
Flag: EXEMPT cleaning up launched flag
Test: atest ApplicationFeatureProviderImplTest
Change-Id: I763683bdd708902305d53c504abc6fae96d4deb4
---
 .../ApplicationFeatureProviderImpl.java            | 10 +++-------
 .../ApplicationFeatureProviderImplTest.java        | 14 --------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 851d763ea94..62c5910904a 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.applications;
 
-import static android.webkit.Flags.updateServiceV2;
-
 import android.Manifest;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
@@ -173,11 +171,9 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
         }
 
         // Keep WebView default package enabled.
-        if (updateServiceV2()) {
-            String packageName = mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName();
-            if (packageName != null) {
-                keepEnabledPackages.add(packageName);
-            }
+        String packageName = mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName();
+        if (packageName != null) {
+            keepEnabledPackages.add(packageName);
         }
 
         keepEnabledPackages.addAll(getEnabledPackageAllowlist());
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index a23ca692970..3afca4da892 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -38,11 +38,8 @@ import android.os.Build;
 import android.os.SystemConfigManager;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.platform.test.annotations.RequiresFlagsDisabled;
-import android.platform.test.annotations.RequiresFlagsEnabled;
 import android.platform.test.flag.junit.CheckFlagsRule;
 import android.platform.test.flag.junit.DeviceFlagsValueProvider;
-import android.webkit.Flags;
 
 import com.android.settings.testutils.ApplicationTestUtils;
 import com.android.settings.webview.WebViewUpdateServiceWrapper;
@@ -373,7 +370,6 @@ public final class ApplicationFeatureProviderImplTest {
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_UPDATE_SERVICE_V2)
     public void getKeepEnabledPackages_shouldContainWebViewPackage() {
         final String testWebViewPackageName = "com.android.webview";
         when(mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName())
@@ -382,16 +378,6 @@ public final class ApplicationFeatureProviderImplTest {
         assertThat(allowlist).contains(testWebViewPackageName);
     }
 
-    @Test
-    @RequiresFlagsDisabled(Flags.FLAG_UPDATE_SERVICE_V2)
-    public void getKeepEnabledPackages_shouldNotContainWebViewPackageIfFlagDisabled() {
-        final String testWebViewPackageName = "com.android.webview";
-        when(mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName())
-                .thenReturn(testWebViewPackageName);
-        final Set<String> allowlist = mProvider.getKeepEnabledPackages();
-        assertThat(allowlist).doesNotContain(testWebViewPackageName);
-    }
-
     @Test
     @Config(shadows = {ShadowSmsApplication.class, ShadowDefaultDialerManager.class})
     public void getKeepEnabledPackages_shouldContainPackageInstaller() {