Merge Android 24Q2 Release (ab/11526283) to aosp-main-future (ef242089) · Commits · e / os / android_packages_services_Telecomm

Android.bp

+20 −28

Original line number	Diff line number	Diff line
		@@ -11,19 +11,12 @@ genrule {
		out: ["com/android/server/telecom/TelecomStatsLog.java"],
		}

		filegroup {
		name: "Telecom-srcs",
		android_library {
		name: "TelecomLib",
		manifest: "AndroidManifestLib.xml",
		srcs: [
		"src/*/.java",
		":statslog-telecom-java-gen",
		],
		}

		// Build the Telecom service.
		android_app {
		name: "Telecom",
		srcs: [
		":Telecom-srcs",
		"proto/*/.proto",
		],
		static_libs: [
		@@ -31,9 +24,6 @@ android_app {
		"androidx.core_core",
		"telecom_flags_core_java_lib",
		],
		libs: [
		"services",
		],
		resource_dirs: ["res"],
		proto: {
		type: "nano",
		@@ -41,6 +31,22 @@ android_app {
		output_params: ["optional_field_style=accessors"],
		},
		platform_apis: true,
		}


		// Build the Telecom service.
		android_app {
		name: "Telecom",
		srcs: [
		],
		static_libs: [
		"TelecomLib",
		],
		libs: [
		"services",
		],
		resource_dirs: [],
		platform_apis: true,
		certificate: "platform",
		privileged: true,
		optimize: {
		@@ -51,6 +57,7 @@ android_app {
		android_test {
		name: "TelecomUnitTests",
		static_libs: [
		"TelecomLib",
		"android-ex-camera2",
		"flag-junit",
		"guava",
		@@ -59,25 +66,15 @@ android_test {
		"platform-test-annotations",
		"androidx.legacy_legacy-support-core-ui",
		"androidx.legacy_legacy-support-core-utils",
		"androidx.core_core",
		"androidx.fragment_fragment",
		"androidx.test.ext.junit",
		"platform-compat-test-rules",
		"telecom_flags_core_java_lib",
		],
		srcs: [
		"tests/src/*/.java",
		":Telecom-srcs",
		"proto/*/.proto",
		],
		proto: {
		type: "nano",
		local_include_dirs: ["proto/"],
		output_params: ["optional_field_style=accessors"],
		},
		resource_dirs: [
		"tests/res",
		"res",
		],
		libs: [
		"android.test.mock",
		@@ -90,11 +87,6 @@ android_test {
		"libstaticjvmtiagent",
		],

		aaptflags: [
		"--auto-add-overlay",
		"--extra-packages",
		"com.android.server.telecom",
		],
		manifest: "tests/AndroidManifest.xml",
		optimize: {
		enabled: false,

AndroidManifest.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -64,8 +64,9 @@
		<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
		<uses-permission android:name="android.permission.USE_COLORIZED_NOTIFICATIONS"/>
		<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
		<uses-permission android:name="com.android.phone.permission.ACCESS_LAST_KNOWN_CELL_ID"/>
		<uses-permission android:name="android.permission.ACCESS_LAST_KNOWN_CELL_ID"/>
		<uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />
		<uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" />

		<permission android:name="android.permission.BROADCAST_CALLLOG_INFO"
		android:label="Broadcast the call type/duration information"

AndroidManifestLib.xml

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2024 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<manifest package="com.android.server.telecom">
		</manifest>

flags/Android.bp

+17 −17

Original line number	Diff line number	Diff line
		@@ -39,6 +39,6 @@ aconfig_declarations {
		"telecom_bluetoothroutemanager_flags.aconfig",
		"telecom_work_profile_flags.aconfig",
		"telecom_connection_service_wrapper_flags.aconfig",
		"telecom_profile_user_flags.aconfig",
		],
		}

flags/telecom_api_flags.aconfig

+36 −7

Original line number	Diff line number	Diff line
		@@ -16,15 +16,44 @@ flag {
		}

		flag{
		name: "unbind_timeout_connections"
		name: "add_call_uri_for_missed_calls"
		namespace: "telecom"
		description: "When set, Telecom will auto-unbind if a ConnectionService returns no connections after some time."
		bug: "293458004"
		description: "The key is used for dialer apps to mark missed calls as read when it gets the notification on reboot."
		bug: "292597423"
		}

		flag{
		name: "add_call_uri_for_missed_calls"
		name: "set_mute_state"
		namespace: "telecom"
		description: "The key is used for dialer apps to mark missed calls as read when it gets the notification on reboot."
		bug: "292597423"
		description: "transactional calls need the ability to mute the call audio input"
		bug: "310669304"
		}

		flag{
		name: "get_registered_phone_accounts"
		namespace: "telecom"
		description: "When set, self-managed clients can get their own phone accounts"
		bug: "317132586"
		}

		flag{
		name: "transactional_video_state"
		namespace: "telecom"
		description: "when set, clients using transactional implementations will be able to set & get the video state"
		bug: "311265260"
		}

		flag{
		name: "business_call_composer"
		namespace: "telecom"
		description: "Enables enriched calling features (e.g. Business name will show for a call)"
		bug: "311688497"
		is_exported: true
		}

		flag{
		name: "get_last_known_cell_identity"
		namespace: "telecom"
		description: "Formalizes the getLastKnownCellIdentity API that Telecom reliees on as a system api"
		bug: "327454165"
		}