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

Commit 66ae830a authored by Hyein Yu's avatar Hyein Yu Committed by Android (Google) Code Review
Browse files

Merge "Add framework-platformtelephony" into main

parents 53eb59be b465f4de

Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -442,6 +442,9 @@ java_library { 
    }) + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), {

        true: [],

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

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

        true: [],

        default: ["framework-platformtelephony.impl"],

    }),

    sdk_version: "core_platform",

    installable: false,
@@ -486,6 +489,8 @@ java_library { 
    visibility: [

        "//frameworks/base:__subpackages__",

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

        // TODO(b/429127828): Clean this up along with RELEASE_TELEPHONY_MODULE

        "//packages/modules/Telephony/framework:__subpackages__",

    ],

    compile_dex: false,

    headers_only: true,
@@ -587,6 +592,9 @@ java_library { 
    }) + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), {

        true: [],

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

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

        true: [],

        default: ["framework-platformtelephony-compat-config"],

    }),

}

api/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -126,7 +126,9 @@ combined_apis { 
        true: [

            "framework-telephony",

        ],

        default: [],

        default: [

            "framework-platformtelephony",

        ],

    }),

    system_server_classpath: [

        "service-art",
@@ -500,6 +502,8 @@ java_defaults { 
        "//frameworks/base/nfc",

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

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

        // TODO(b/429127828): Clean this up along with RELEASE_TELEPHONY_MODULE

        "//packages/modules/Telephony/framework:__subpackages__",

    ],

    plugins: ["error_prone_android_framework"],

    errorprone: {

api/api.go

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ const virtualization = "framework-virtualization" 
const location = "framework-location"

const platformCrashrecovery = "framework-platformcrashrecovery"

const ondeviceintelligence = "framework-ondeviceintelligence-platform"

const platformTelephony = "framework-platformtelephony"



var core_libraries_modules = []string{art, conscrypt, i18n}
@@ -41,7 +42,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, ondeviceintelligence}

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



// 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