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

Commit 8b82c22d authored by Anna Malova's avatar Anna Malova
Browse files

Remove libpac usage from Android. 

Android's libpac is replaced with WebView implementation.
This will allow to remove V8 which is used only by libpac.

Bug: 165006496
Test: Manual. Remove libpac and v8 from manifest, check there are no
compilation errors.
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest
Change-Id: Id6b9a223c176ce1b2dd7f7c4dd9ee54001dae1a4

Change-Id: If3ee10fcd0306b4b7a3c8b498e877d59398f642a
parent 5bb7698d

core/res/res/values/config.xml

+0 −5
Original line number Diff line number Diff line
@@ -271,11 +271,6 @@ 
         when there's no network connection. If the scan doesn't timeout, use zero -->

    <integer name="config_radioScanningTimeout">0</integer>



    <!-- When true, Android uses the PAC implementation included in WebView to handle

         networks with PAC scripts.

         When false, Android's own implementation of libpac is used.-->

    <bool name ="config_useWebViewPacProcessor">true</bool>



    <!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.

         Please don't copy them, copy anything else. -->

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ 
  <java-symbol type="bool" name="config_duplicate_port_omadm_wappush" />

  <java-symbol type="bool" name="config_disableTransitionAnimation" />

  <java-symbol type="bool" name="config_enableAutoPowerModes" />

  <java-symbol type="bool" name="config_useWebViewPacProcessor" />

  <java-symbol type="integer" name="config_autoPowerModeThresholdAngle" />

  <java-symbol type="integer" name="config_autoPowerModeAnyMotionSensor" />

  <java-symbol type="bool" name="config_autoPowerModePreferWristTilt" />

packages/services/PacProcessor/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ android_app { 
    srcs: ["src/**/*.java"],

    platform_apis: true,

    certificate: "platform",

    jni_libs: ["libjni_pacprocessor"],

}



filegroup {

packages/services/PacProcessor/jni/Android.bp

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
//

// Copyright (C) 2013 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



cc_library_shared {

    name: "libjni_pacprocessor",



    srcs: [

        "jni_init.cpp",

        "com_android_pacprocessor_PacNative.cpp",

    ],



    shared_libs: [

        "libandroidfw",

        "libandroid_runtime",

        "liblog",

        "libutils",

        "libnativehelper",

        "libpac",

    ],



    cflags: [

        "-Wall",

        "-Werror",

        "-Wunused",

        "-Wunreachable-code",

    ],

    sanitize: {

       cfi: true,

    },

}

packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp

deleted100644 → 0
+0 −133
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#define LOG_TAG "PacProcessor"



#include <stdlib.h>

#include <string>



#include <utils/Log.h>

#include <utils/Mutex.h>

#include "android_runtime/AndroidRuntime.h"



#include "jni.h"

#include <nativehelper/JNIHelp.h>



#include "proxy_resolver_v8_wrapper.h"



namespace android {



ProxyResolverV8Handle* proxyResolver = NULL;

bool pacSet = false;



std::u16string jstringToString16(JNIEnv* env, jstring jstr) {

    const jchar* str = env->GetStringCritical(jstr, 0);

    std::u16string str16(reinterpret_cast<const char16_t*>(str),

                   env->GetStringLength(jstr));

    env->ReleaseStringCritical(jstr, str);

    return str16;

}



jstring string16ToJstring(JNIEnv* env, std::u16string string) {

    const char16_t* str = string.data();

    size_t len = string.length();



    return env->NewString(reinterpret_cast<const jchar*>(str), len);

}



static jboolean com_android_pacprocessor_PacNative_createV8ParserNativeLocked(JNIEnv* /* env */,

        jobject) {

    if (proxyResolver == NULL) {

        proxyResolver = ProxyResolverV8Handle_new();

        pacSet = false;

        return JNI_FALSE;

    }

    return JNI_TRUE;

}



static jboolean com_android_pacprocessor_PacNative_destroyV8ParserNativeLocked(JNIEnv* /* env */,

        jobject) {

    if (proxyResolver != NULL) {

        ProxyResolverV8Handle_delete(proxyResolver);

        proxyResolver = NULL;

        return JNI_FALSE;

    }

    return JNI_TRUE;

}



static jboolean com_android_pacprocessor_PacNative_setProxyScriptNativeLocked(JNIEnv* env, jobject,

        jstring script) {

    std::u16string script16 = jstringToString16(env, script);



    if (proxyResolver == NULL) {

        ALOGE("V8 Parser not started when setting PAC script");

        return JNI_TRUE;

    }



    if (ProxyResolverV8Handle_SetPacScript(proxyResolver, script16.data()) != OK) {

        ALOGE("Unable to set PAC script");

        return JNI_TRUE;

    }

    pacSet = true;



    return JNI_FALSE;

}



static jstring com_android_pacprocessor_PacNative_makeProxyRequestNativeLocked(JNIEnv* env, jobject,

        jstring url, jstring host) {

    std::u16string url16 = jstringToString16(env, url);

    std::u16string host16 = jstringToString16(env, host);



    if (proxyResolver == NULL) {

        ALOGE("V8 Parser not initialized when running PAC script");

        return NULL;

    }



    if (!pacSet) {

        ALOGW("Attempting to run PAC with no script set");

        return NULL;

    }



    std::unique_ptr<char16_t, decltype(&free)> result = std::unique_ptr<char16_t, decltype(&free)>(

        ProxyResolverV8Handle_GetProxyForURL(proxyResolver, url16.data(), host16.data()), &free);

    if (result.get() == NULL) {

        ALOGE("Error Running PAC");

        return NULL;

    }



    std::u16string ret(result.get());

    jstring jret = string16ToJstring(env, ret);



    return jret;

}



static const JNINativeMethod gMethods[] = {

    { "createV8ParserNativeLocked", "()Z",

        (void*)com_android_pacprocessor_PacNative_createV8ParserNativeLocked},

    { "destroyV8ParserNativeLocked", "()Z",

        (void*)com_android_pacprocessor_PacNative_destroyV8ParserNativeLocked},

    { "setProxyScriptNativeLocked", "(Ljava/lang/String;)Z",

        (void*)com_android_pacprocessor_PacNative_setProxyScriptNativeLocked},

    { "makeProxyRequestNativeLocked", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",

        (void*)com_android_pacprocessor_PacNative_makeProxyRequestNativeLocked},

};



int register_com_android_pacprocessor_PacNative(JNIEnv* env) {

    return jniRegisterNativeMethods(env, "com/android/pacprocessor/PacNative",

            gMethods, NELEM(gMethods));

}



} /* namespace android */