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

am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev

Browse Source 
* commit '27936ad3a677509fab1174c7b6655c894f018143':
  Block loading WebView in privileged processes.
This commit is contained in:
Jeff Sharkey
2014-11-14 19:33:49 +00:00
committed by Android Git Automerger
parent 55c741a736 27936ad3a6
commit 47d2c97e70
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/webkit/WebViewFactory.java
View File

@@ -18,8 +18,8 @@ package android.webkit;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.app.ActivityManagerInternal; import android.app.ActivityManagerInternal;
import android.app.Application;
import android.app.AppGlobals; import android.app.AppGlobals;
import android.app.Application;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
@@ -34,14 +34,14 @@ import android.os.Trace;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AndroidRuntimeException; import android.util.AndroidRuntimeException;
import android.util.Log; import android.util.Log;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import dalvik.system.VMRuntime; import dalvik.system.VMRuntime;
import java.io.File; import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import com.android.internal.os.Zygote;
/** /**
* Top level factory, used creating all the main WebView implementation classes. * Top level factory, used creating all the main WebView implementation classes.
* *
@@ -91,6 +91,12 @@ public final class WebViewFactory {
// us honest and minimize usage of WebView internals when binding the proxy. // us honest and minimize usage of WebView internals when binding the proxy.
if (sProviderInstance != null) return sProviderInstance; if (sProviderInstance != null) return sProviderInstance;
final int uid = android.os.Process.myUid();
if (uid == android.os.Process.ROOT_UID || uid == android.os.Process.SYSTEM_UID) {
throw new UnsupportedOperationException(
"For security reasons, WebView is not allowed in privileged processes");
}
Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.getProvider()"); Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.getProvider()");
try { try {
Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.loadNativeLibrary()"); Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.loadNativeLibrary()");