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

Commit 14879722 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Move connectivity sources to packages/Connectivity" into sc-dev am: 92e25f77 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14516148

Change-Id: Ie639c129bab6ffe08c0bb102a1b53596635b5c2f
parents 25d1b445 92e25f77

packages/Connectivity/service/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ java_library { 
    sdk_version: "system_server_current",

    min_sdk_version: "30",

    srcs: [

        ":connectivity-service-srcs",

        "src/**/*.java",

        ":framework-connectivity-shared-srcs",

        ":services-connectivity-shared-srcs",

        // TODO: move to net-utils-device-common, enable shrink optimization to avoid extra classes

packages/Connectivity/service/lint-baseline.xml

+6 −6
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
        errorLine1="            if (tm.isDataCapable()) {"

        errorLine2="                   ~~~~~~~~~~~~~">

        <location

            file="frameworks/base/services/core/java/com/android/server/ConnectivityService.java"

            line="781"

            file="frameworks/base/packages/Connectivity/service/src/com/android/server/ConnectivityService.java"

            line="787"

            column="20"/>

    </issue>
@@ -18,8 +18,8 @@ 
        errorLine1="                mUserAllContext.sendStickyBroadcast(intent, options);"

        errorLine2="                                ~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/services/core/java/com/android/server/ConnectivityService.java"

            line="2633"

            file="frameworks/base/packages/Connectivity/service/src/com/android/server/ConnectivityService.java"

            line="2681"

            column="33"/>

    </issue>
@@ -29,8 +29,8 @@ 
        errorLine1="            final int callingVersion = pm.getTargetSdkVersion(callingPackageName);"

        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/services/core/java/com/android/server/ConnectivityService.java"

            line="5784"

            file="frameworks/base/packages/Connectivity/service/src/com/android/server/ConnectivityService.java"

            line="5851"

            column="43"/>

    </issue>