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

Commit 5ff91c01 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Switch framework-tethering to use java_sdk_library"

parents 7ed44288 9adce17a

packages/Tethering/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ java_defaults { 
        "net-utils-framework-common",

    ],

    libs: [

        "framework-tethering",

        "framework-tethering.impl",

        "unsupportedappusage",

    ],

    plugins: ["java_api_finder"],
@@ -96,7 +96,7 @@ java_defaults { 
        "res",

    ],

    libs: [

        "framework-tethering",

        "framework-tethering.impl",

    ],

    jarjar_rules: "jarjar-rules.txt",

    optimize: {

packages/Tethering/common/TetheringLib/Android.bp

+9 −65
Original line number Diff line number Diff line
@@ -13,31 +13,28 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



java_library {

java_sdk_library {

    name: "framework-tethering",

    sdk_version: "module_current",

    defaults: ["framework-module-defaults"],

    srcs: [

        ":framework-tethering-srcs",

    ],



    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.

    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate

    // modules to java_sdk_library.

    naming_scheme: "framework-modules",



    jarjar_rules: "jarjar-rules.txt",

    installable: true,



    libs: [

        "framework-annotations-lib",

    ],



    hostdex: true, // for hiddenapi check

    visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],

    stubs_library_visibility: ["//visibility:public"],

    apex_available: ["com.android.tethering"],

    permitted_packages: ["android.net"],

}



stubs_defaults {

    name: "framework-tethering-stubs-defaults",

    srcs: [":framework-tethering-srcs"],

    dist: { dest: "framework-tethering.txt" },

}



filegroup {

    name: "framework-tethering-srcs",

    srcs: [
@@ -55,56 +52,3 @@ filegroup { 
    ],

    path: "src"

}
 


droidstubs {

    name: "framework-tethering-stubs-srcs-publicapi",

    defaults: [

        "framework-module-stubs-defaults-publicapi",

        "framework-tethering-stubs-defaults",

    ],

}



droidstubs {

    name: "framework-tethering-stubs-srcs-systemapi",

    defaults: [

        "framework-module-stubs-defaults-systemapi",

        "framework-tethering-stubs-defaults",

    ],

}



droidstubs {

    name: "framework-tethering-api-module_libs_api",

    defaults: [

        "framework-module-api-defaults-module_libs_api",

        "framework-tethering-stubs-defaults",

    ],

}



droidstubs {

    name: "framework-tethering-stubs-srcs-module_libs_api",

    defaults: [

        "framework-module-stubs-defaults-module_libs_api",

        "framework-tethering-stubs-defaults",

    ],

}



java_library {

    name: "framework-tethering-stubs-publicapi",

    srcs: [":framework-tethering-stubs-srcs-publicapi"],

    defaults: ["framework-module-stubs-lib-defaults-publicapi"],

    dist: { dest: "framework-tethering.jar" },

}



java_library {

    name: "framework-tethering-stubs-systemapi",

    srcs: [":framework-tethering-stubs-srcs-systemapi"],

    defaults: ["framework-module-stubs-lib-defaults-systemapi"],

    dist: { dest: "framework-tethering.jar" },

}



java_library {

    name: "framework-tethering-stubs-module_libs_api",

    srcs: [":framework-tethering-stubs-srcs-module_libs_api"],

    defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],

    dist: { dest: "framework-tethering.jar" },

}

packages/Tethering/common/TetheringLib/api/module-lib-lint-baseline.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
// Baseline format: 1.0

ActionValue: android.net.TetheringConstants#EXTRA_ADD_TETHER_TYPE:

    Inconsistent extra value; expected `android.net.extra.ADD_TETHER_TYPE`, was `extraAddTetherType`

ActionValue: android.net.TetheringConstants#EXTRA_PROVISION_CALLBACK:

    Inconsistent extra value; expected `android.net.extra.PROVISION_CALLBACK`, was `extraProvisionCallback`

ActionValue: android.net.TetheringConstants#EXTRA_REM_TETHER_TYPE:

    Inconsistent extra value; expected `android.net.extra.REM_TETHER_TYPE`, was `extraRemTetherType`

ActionValue: android.net.TetheringConstants#EXTRA_RUN_PROVISION:

    Inconsistent extra value; expected `android.net.extra.RUN_PROVISION`, was `extraRunProvision`

ActionValue: android.net.TetheringConstants#EXTRA_SET_ALARM:

    Inconsistent extra value; expected `android.net.extra.SET_ALARM`, was `extraSetAlarm`

ActionValue: android.net.TetheringManager#ACTION_TETHER_STATE_CHANGED:

    Inconsistent action value; expected `android.net.action.TETHER_STATE_CHANGED`, was `android.net.conn.TETHER_STATE_CHANGED`

ActionValue: android.net.TetheringManager#EXTRA_ACTIVE_TETHER:

    Inconsistent extra value; expected `android.net.extra.ACTIVE_TETHER`, was `tetherArray`

ActionValue: android.net.TetheringManager#EXTRA_AVAILABLE_TETHER:

    Inconsistent extra value; expected `android.net.extra.AVAILABLE_TETHER`, was `availableArray`

ActionValue: android.net.TetheringManager#EXTRA_ERRORED_TETHER:

    Inconsistent extra value; expected `android.net.extra.ERRORED_TETHER`, was `erroredArray`





CallbackInterface: android.net.TetheringManager.StartTetheringCallback:

    Callbacks must be abstract class instead of interface to enable extension in future API levels: StartTetheringCallback

CallbackInterface: android.net.TetheringManager.TetheringEventCallback:

    Callbacks must be abstract class instead of interface to enable extension in future API levels: TetheringEventCallback





ManagerConstructor: android.net.TetheringManager#TetheringManager(android.content.Context, java.util.function.Supplier<android.os.IBinder>):

    Managers must always be obtained from Context; no direct constructors





MissingGetterMatchingBuilder: android.net.TetheringManager.TetheringRequest.Builder#setShouldShowEntitlementUi(boolean):

    android.net.TetheringManager.TetheringRequest does not declare a `shouldShowEntitlementUi()` method matching method android.net.TetheringManager.TetheringRequest.Builder.setShouldShowEntitlementUi(boolean)

MissingGetterMatchingBuilder: android.net.TetheringManager.TetheringRequest.Builder#setStaticIpv4Addresses(android.net.LinkAddress, android.net.LinkAddress):

    android.net.TetheringManager.TetheringRequest does not declare a `getStaticIpv4Addresses()` method matching method android.net.TetheringManager.TetheringRequest.Builder.setStaticIpv4Addresses(android.net.LinkAddress,android.net.LinkAddress)





StaticFinalBuilder: android.net.TetheringManager.TetheringRequest.Builder:

    Builder must be final: android.net.TetheringManager.TetheringRequest.Builder

packages/Tethering/common/TetheringLib/api/system-lint-baseline.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
// Baseline format: 1.0

ActionValue: android.net.TetheringManager#ACTION_TETHER_STATE_CHANGED:

    Inconsistent action value; expected `android.net.action.TETHER_STATE_CHANGED`, was `android.net.conn.TETHER_STATE_CHANGED`

ActionValue: android.net.TetheringManager#EXTRA_ACTIVE_TETHER:

    Inconsistent extra value; expected `android.net.extra.ACTIVE_TETHER`, was `tetherArray`

ActionValue: android.net.TetheringManager#EXTRA_AVAILABLE_TETHER:

    Inconsistent extra value; expected `android.net.extra.AVAILABLE_TETHER`, was `availableArray`

ActionValue: android.net.TetheringManager#EXTRA_ERRORED_TETHER:

    Inconsistent extra value; expected `android.net.extra.ERRORED_TETHER`, was `erroredArray`





CallbackInterface: android.net.TetheringManager.StartTetheringCallback:

    Callbacks must be abstract class instead of interface to enable extension in future API levels: StartTetheringCallback

CallbackInterface: android.net.TetheringManager.TetheringEventCallback:

    Callbacks must be abstract class instead of interface to enable extension in future API levels: TetheringEventCallback





MissingGetterMatchingBuilder: android.net.TetheringManager.TetheringRequest.Builder#setShouldShowEntitlementUi(boolean):

    android.net.TetheringManager.TetheringRequest does not declare a `shouldShowEntitlementUi()` method matching method android.net.TetheringManager.TetheringRequest.Builder.setShouldShowEntitlementUi(boolean)

MissingGetterMatchingBuilder: android.net.TetheringManager.TetheringRequest.Builder#setStaticIpv4Addresses(android.net.LinkAddress, android.net.LinkAddress):

    android.net.TetheringManager.TetheringRequest does not declare a `getStaticIpv4Addresses()` method matching method android.net.TetheringManager.TetheringRequest.Builder.setStaticIpv4Addresses(android.net.LinkAddress,android.net.LinkAddress)





StaticFinalBuilder: android.net.TetheringManager.TetheringRequest.Builder:

    Builder must be final: android.net.TetheringManager.TetheringRequest.Builder

packages/Tethering/tests/unit/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ java_library { 
    sdk_version: "core_platform",

    libs: [

        "framework-minus-apex",

        "framework-tethering",

        "framework-tethering.impl",

    ],

    visibility: ["//cts/tests/tests/tethering"],

}
@@ -59,7 +59,7 @@ java_defaults { 
        "ext",

        "framework-minus-apex",

        "framework-res",

        "framework-tethering",

        "framework-tethering.impl",

    ],

    jni_libs: [

        // For mockito extended