Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7850912 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles)
Browse files

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
parent 7446c0fa

src/com/android/settings/applications/ApplicationFeatureProviderImpl.java

+3 −7
Original line number Diff line number Diff line
@@ -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,12 +171,10 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide 
        }



        // Keep WebView default package enabled.

        if (updateServiceV2()) {

        String packageName = mWebViewUpdateServiceWrapper.getDefaultWebViewPackageName();

        if (packageName != null) {

            keepEnabledPackages.add(packageName);

        }

        }



        keepEnabledPackages.addAll(getEnabledPackageAllowlist());

tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java

+0 −14
Original line number Diff line number Diff line
@@ -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() {