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

Commit 30428c4d authored by Victor Chang's avatar Victor Chang
Browse files

Move the implementation of ProxyErrorListener to libpac 

The implementation logs the error in Android.

libpac will provide C API, not C++ API. This change
prepares for the migration.

Bug: 121269980
Test: m droid
Change-Id: Ib39e76d1880c33656d5ddbffdc3c124e7e911c16
parent d274332a

packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp

+1 −21
Original line number Diff line number Diff line
@@ -27,23 +27,7 @@ 


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;

ProxyErrorLogger* logger = NULL;

bool pacSet = false;



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 */,

        jobject) {

    if (proxyResolver == NULL) {

        logger = new ProxyErrorLogger();

        proxyResolver = new net::ProxyResolverV8(net::ProxyResolverJSBindings::CreateDefault(),

                logger);

        proxyResolver = new net::ProxyResolverV8(net::ProxyResolverJSBindings::CreateDefault());

        pacSet = 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 */,

        jobject) {

    if (proxyResolver != NULL) {

        delete logger;

        delete proxyResolver;

        logger = NULL;

        proxyResolver = NULL;

        return JNI_FALSE;

    }