Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Provide command to change WebView implementation." into nyc-dev

Browse Source
This commit is contained in:
Gustav Sennton
2016-04-04 22:09:35 +00:00
committed by Android (Google) Code Review
parent a7f775db93 ab3b6b1258
commit 3d48074ed9
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/webkit/WebViewUpdateService.java
View File

@@ -613,7 +613,12 @@ public class WebViewUpdateService extends SystemService {
throw new SecurityException(msg);
}
return WebViewUpdateService.this.changeProviderAndSetting(newProvider);
long callingId = Binder.clearCallingIdentity();
try {
return WebViewUpdateService.this.changeProviderAndSetting(newProvider);
} finally {
Binder.restoreCallingIdentity(callingId);
}
}
@Override // Binder call

20
services/core/java/com/android/server/webkit/WebViewUpdateServiceShellCommand.java
View File

@@ -36,12 +36,13 @@ class WebViewUpdateServiceShellCommand extends ShellCommand {
final PrintWriter pw = getOutPrintWriter();
try {
// TODO(gsennton) add command for changing WebView provider
switch(cmd) {
case "enable-redundant-packages":
return enableFallbackLogic(false);
case "disable-redundant-packages":
return enableFallbackLogic(true);
case "set-webview-implementation":
return setWebViewImplementation();
default:
return handleDefaultCommands(cmd);
}
@@ -58,6 +59,21 @@ class WebViewUpdateServiceShellCommand extends ShellCommand {
return 0;
}
private int setWebViewImplementation() throws RemoteException {
final PrintWriter pw = getOutPrintWriter();
String shellChosenPackage = getNextArg();
String newPackage = mInterface.changeProviderAndSetting(shellChosenPackage);
if (shellChosenPackage.equals(newPackage)) {
pw.println("Success");
return 0;
} else {
pw.println(String.format(
"Failed to switch to %s, the WebView implementation is now provided by %s.",
shellChosenPackage, newPackage));
return 1;
}
}
@Override
public void onHelp() {
PrintWriter pw = getOutPrintWriter();
@@ -72,6 +88,8 @@ class WebViewUpdateServiceShellCommand extends ShellCommand {
pw.println(" disable-redundant-packages");
pw.println(" Disallow installing and enabling fallback packages when a more-preferred");
pw.println(" package is available.");
pw.println(" set-webview-implementation PACKAGE");
pw.println(" Set the WebView implementation to the specified package.");
pw.println();
}
}