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

Commit 46f44ceb authored by Sandeep Bandaru's avatar Sandeep Bandaru
Browse files

Fix hidden API usages to alternative API usages 

After moving the code to mainline module, all interactions from
platform should be via APIs or relevant util classes cloned and
jarjar'd within the module.

This change moves such usages to existing APIs or makes a module-utils
copy of such classes to be used independantly in the module.

Flag: build.release_ondevice_intelligence_module
Bug: 376427781
Change-Id: I5bc5fa5b7e2e2ba2899b4cbba536103d66a6aa19
parent c8b00c8a

AconfigFlags.bp

+0 −15
Original line number Diff line number Diff line
@@ -808,21 +808,6 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// OnDeviceIntelligence

aconfig_declarations {

    name: "android.app.ondeviceintelligence-aconfig",

    exportable: true,

    package: "android.app.ondeviceintelligence.flags",

    container: "system",

    srcs: ["core/java/android/app/ondeviceintelligence/flags/ondevice_intelligence.aconfig"],

}



java_aconfig_library {

    name: "android.app.ondeviceintelligence-aconfig-java",

    aconfig_declarations: "android.app.ondeviceintelligence-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Permissions

aconfig_declarations {

    name: "android.permission.flags-aconfig",

Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -446,6 +446,9 @@ java_library { 
        default: [

            "framework-platformcrashrecovery.impl",

        ],

    }) + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), {

        true: [],

        default: ["framework-ondeviceintelligence-platform.impl"],

    }),

    sdk_version: "core_platform",

    installable: false,
@@ -489,6 +492,7 @@ java_library { 
    apex_available: ["//apex_available:platform"],

    visibility: [

        "//frameworks/base:__subpackages__",

        "//packages/modules/NeuralNetworks:__subpackages__",

    ],

    compile_dex: false,

    headers_only: true,
@@ -584,6 +588,9 @@ java_library { 
        default: [

            "framework-platformcrashrecovery-compat-config",

        ],

    }) + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), {

        true: [],

        default: ["framework-ondeviceintelligence-platform-compat-config"],

    }),

}

api/Android.bp

+14 −1
Original line number Diff line number Diff line
@@ -105,6 +105,13 @@ combined_apis { 
        default: [

            "framework-platformcrashrecovery",

        ],

    }) + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), {

        true: [

            "framework-ondeviceintelligence",

        ],

        default: [

            "framework-ondeviceintelligence-platform",

        ],

    }) + select(release_flag("RELEASE_RANGING_STACK"), {

        true: [

            "framework-ranging",
@@ -119,7 +126,12 @@ combined_apis { 
        "service-permission",

        "service-rkp",

        "service-sdksandbox",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

    ] + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), {

        true: [

            "service-ondeviceintelligence",

        ],

        default: [],

    }) + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": [

            "service-crashrecovery",

        ],
@@ -478,6 +490,7 @@ java_defaults { 
        "//frameworks/base/location",

        "//frameworks/base/packages/CrashRecovery/framework",

        "//frameworks/base/nfc",

        "//packages/modules/NeuralNetworks:__subpackages__",

    ],

    plugins: ["error_prone_android_framework"],

    errorprone: {

api/api.go

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ const i18n = "i18n.module.public.api" 
const virtualization = "framework-virtualization"

const location = "framework-location"

const platformCrashrecovery = "framework-platformcrashrecovery"

const ondeviceintelligence = "framework-ondeviceintelligence-platform"



var core_libraries_modules = []string{art, conscrypt, i18n}
@@ -40,7 +41,7 @@ var core_libraries_modules = []string{art, conscrypt, i18n} 
// APIs.

// In addition, the modules in this list are allowed to contribute to test APIs

// stubs.

var non_updatable_modules = []string{virtualization, location, platformCrashrecovery}

var non_updatable_modules = []string{virtualization, location, platformCrashrecovery, ondeviceintelligence}



// The intention behind this soong plugin is to generate a number of "merged"

// API-related modules that would otherwise require a large amount of very

boot/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ soong_config_module_type { 
        "car_bootclasspath_fragment",

        "nfc_apex_bootclasspath_fragment",

        "release_crashrecovery_module",

        "release_ondevice_intelligence_module",

        "release_package_profiling_module",

    ],

    properties: [
@@ -176,6 +177,15 @@ custom_platform_bootclasspath { 
                },

            ],

        },

        release_ondevice_intelligence_module: {

            fragments: [

                // only used when ondeviceintelligence is moved to neuralnetworks module

                {

                    apex: "com.android.neuralnetworks",

                    module: "com.android.ondeviceintelligence-bootclasspath-fragment",

                },

            ],

        },

        release_package_profiling_module: {

            fragments: [

                // only used if profiling is enabled.