Remove WebView fallback package handling.
There is no longer a special "fallback package" state for WebView that means it should not be able to have its enabled/disabled state controlled by the user. Remove the code used to implement this in Settings. Bug: 129470358 Test: verify that WebView's enable/disable button is not greyed out Change-Id: Ifc0921511a71282a77f239e5ff5955e60fab6e2c
This commit is contained in:
@@ -33,13 +33,10 @@ import android.content.res.Resources;
|
||||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.os.RemoteException;
|
||||
import android.os.ServiceManager;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.webkit.IWebViewUpdateService;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.fragment.app.Fragment;
|
||||
@@ -438,10 +435,6 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
|
||||
enabled = false;
|
||||
}
|
||||
|
||||
if (isFallbackPackage(mAppEntry.info.packageName)) {
|
||||
enabled = false;
|
||||
}
|
||||
|
||||
mButtonsPref.setButton2Enabled(enabled);
|
||||
}
|
||||
|
||||
@@ -466,22 +459,6 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
|
||||
}
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
boolean isFallbackPackage(String packageName) {
|
||||
try {
|
||||
IWebViewUpdateService webviewUpdateService =
|
||||
IWebViewUpdateService.Stub.asInterface(
|
||||
ServiceManager.getService("webviewupdate"));
|
||||
if (webviewUpdateService.isFallbackPackage(packageName)) {
|
||||
return true;
|
||||
}
|
||||
} catch (RemoteException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void updateForceStopButton() {
|
||||
if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
|
||||
|
Reference in New Issue
Block a user