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

Merge "Move the implementation of ProxyErrorListener to libpac"

Browse Source
This commit is contained in:
vichang
2019-01-08 20:08:43 +00:00
committed by Gerrit Code Review
parent a95eac0c59 30428c4d53
commit ca712e75a9
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp
View File

@@ -27,23 +27,7 @@
namespace android { namespace android {
class ProxyErrorLogger : public net::ProxyErrorListener {
public:
~ProxyErrorLogger() {
}
void AlertMessage(String16 message) {
String8 str(message);
ALOGD("Alert: %s", str.string());
}
void ErrorMessage(String16 message) {
String8 str(message);
ALOGE("Error: %s", str.string());
}
};
net::ProxyResolverV8* proxyResolver = NULL; net::ProxyResolverV8* proxyResolver = NULL;
ProxyErrorLogger* logger = NULL;
bool pacSet = false; bool pacSet = false;
String16 jstringToString16(JNIEnv* env, jstring jstr) { String16 jstringToString16(JNIEnv* env, jstring jstr) {
@@ -64,9 +48,7 @@ jstring string16ToJstring(JNIEnv* env, String16 string) {
static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JNIEnv* /* env */, static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JNIEnv* /* env */,
jobject) { jobject) {
if (proxyResolver == NULL) { if (proxyResolver == NULL) {
logger = new ProxyErrorLogger(); proxyResolver = new net::ProxyResolverV8(net::ProxyResolverJSBindings::CreateDefault());
proxyResolver = new net::ProxyResolverV8(net::ProxyResolverJSBindings::CreateDefault(),
logger);
pacSet = false; pacSet = false;
return JNI_FALSE; return JNI_FALSE;
} }
@@ -76,9 +58,7 @@ static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JN
static jboolean com_android_pacprocessor_PacNative_destroyV8ParserNativeLocked(JNIEnv* /* env */, static jboolean com_android_pacprocessor_PacNative_destroyV8ParserNativeLocked(JNIEnv* /* env */,
jobject) { jobject) {
if (proxyResolver != NULL) { if (proxyResolver != NULL) {
delete logger;
delete proxyResolver; delete proxyResolver;
logger = NULL;
proxyResolver = NULL; proxyResolver = NULL;
return JNI_FALSE; return JNI_FALSE;
} }