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

Commit 9134bffa authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-connectivity_jar_in_apex" 

* changes:
  Revert "Set setCurrentProxyScriptUrl as public"
  Revert "Move service-connectivity to the tethering APEX"
parents f85f6372 e3227168

packages/Connectivity/service/Android.bp

+19 −5
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
// limitations under the License.

//



cc_library_shared {

    name: "libservice-connectivity",

cc_defaults {

    name: "libservice-connectivity-defaults",

    // TODO: build against the NDK (sdk_version: "30" for example)

    cflags: [

        "-Wall",
@@ -26,7 +26,6 @@ cc_library_shared { 
    srcs: [

        "jni/com_android_server_TestNetworkService.cpp",

        "jni/com_android_server_connectivity_Vpn.cpp",

        "jni/onload.cpp",

    ],

    shared_libs: [

        "libbase",
@@ -36,11 +35,27 @@ cc_library_shared { 
        // addresses, and remove dependency on libnetutils.

        "libnetutils",

    ],

}



cc_library_shared {

    name: "libservice-connectivity",

    defaults: ["libservice-connectivity-defaults"],

    srcs: [

        "jni/onload.cpp",

    ],

    apex_available: [

        "com.android.tethering",

        // TODO: move this library to the tethering APEX and remove libservice-connectivity-static

        // "com.android.tethering",

    ],

}



// Static library linked into libservices.core until libservice-connectivity can be loaded from

// the tethering APEX instead.

cc_library_static {

    name: "libservice-connectivity-static",

    defaults: ["libservice-connectivity-defaults"],

}



java_library {

    name: "service-connectivity",

    srcs: [
@@ -60,6 +75,5 @@ java_library { 
    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.tethering",

    ],

}

services/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ java_library { 
        "services.voiceinteraction",

        "services.wifi",

        "service-blobstore",

        "service-connectivity",

        "service-jobscheduler",

        "android.hidl.base-V1.0-java",

    ],

services/core/java/com/android/server/ConnectivityServiceInitializer.java

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ public final class ConnectivityServiceInitializer extends SystemService { 


    public ConnectivityServiceInitializer(Context context) {

        super(context);

        // Load JNI libraries used by ConnectivityService and its dependencies

        System.loadLibrary("service-connectivity");

        // TODO: Define formal APIs to get the needed services.

        mConnectivity = new ConnectivityService(context, getNetworkManagementService(),

                getNetworkStatsService());

services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java

+0 −2
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ final public class IpConnectivityMetrics extends SystemService { 


    public IpConnectivityMetrics(Context ctx, ToIntFunction<Context> capacityGetter) {

        super(ctx);

        // Load JNI libraries used by the IpConnectivityMetrics service and its dependencies

        System.loadLibrary("service-connectivity");

        mCapacityGetter = capacityGetter;

        initBuffer();

    }

services/core/java/com/android/server/connectivity/PacManager.java

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public class PacManager { 
     * @param proxy Proxy information that is about to be broadcast.

     * @return Returns whether the broadcast should be sent : either DO_ or DONT_SEND_BROADCAST

     */

    public synchronized boolean setCurrentProxyScriptUrl(ProxyInfo proxy) {

    synchronized boolean setCurrentProxyScriptUrl(ProxyInfo proxy) {

        if (!Uri.EMPTY.equals(proxy.getPacFileUrl())) {

            if (proxy.getPacFileUrl().equals(mPacUrl) && (proxy.getPort() > 0)) {

                // Allow to send broadcast, nothing to do.