PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up android.webkit.update_service_v2." into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-10-30 21:21:33 +00:00
committed by Android (Google) Code Review
parent 4c0df13f28 b78509129b
commit 01359592a2
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.applications; package com.android.settings.applications;
import static android.webkit.Flags.updateServiceV2;
import android.Manifest; import android.Manifest;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.ComponentName; import android.content.ComponentName;
@@ -173,12 +171,10 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
} }
// Keep WebView default package enabled. // Keep WebView default package enabled.
if (updateServiceV2()) {
String packageName = mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName(); String packageName = mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName();
if (packageName != null) { if (packageName != null) {
keepEnabledPackages.add(packageName); keepEnabledPackages.add(packageName);
} }
}
keepEnabledPackages.addAll(getEnabledPackageAllowlist()); keepEnabledPackages.addAll(getEnabledPackageAllowlist());

14
tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
View File

@@ -38,11 +38,8 @@ import android.os.Build;
import android.os.SystemConfigManager; import android.os.SystemConfigManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; 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.CheckFlagsRule;
import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import android.webkit.Flags;
import com.android.settings.testutils.ApplicationTestUtils; import com.android.settings.testutils.ApplicationTestUtils;
import com.android.settings.webview.WebViewUpdateServiceWrapper; import com.android.settings.webview.WebViewUpdateServiceWrapper;
@@ -373,7 +370,6 @@ public final class ApplicationFeatureProviderImplTest {
} }
@Test @Test
@RequiresFlagsEnabled(Flags.FLAG_UPDATE_SERVICE_V2)
public void getKeepEnabledPackages_shouldContainWebViewPackage() { public void getKeepEnabledPackages_shouldContainWebViewPackage() {
final String testWebViewPackageName = "com.android.webview"; final String testWebViewPackageName = "com.android.webview";
when(mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName()) when(mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName())
@@ -382,16 +378,6 @@ public final class ApplicationFeatureProviderImplTest {
assertThat(allowlist).contains(testWebViewPackageName); 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 @Test
@Config(shadows = {ShadowSmsApplication.class, ShadowDefaultDialerManager.class}) @Config(shadows = {ShadowSmsApplication.class, ShadowDefaultDialerManager.class})
public void getKeepEnabledPackages_shouldContainPackageInstaller() { public void getKeepEnabledPackages_shouldContainPackageInstaller() {