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

Commit 0087456b authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR2 to AOSP main 

Bug: 319669529
Merged-In: Ide83e390a0f5c8f4bb25665355ff389e990dfa6f
Change-Id: I7ebff191a22f491eb9425d32956cf47c2fd9c7ea
parents 5577e482 076f0ca8

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ android_app { 
    static_libs: [

        "androidx.annotation_annotation",

        "androidx.core_core",

        "telecom_flags_core_java_lib",

    ],

    libs: [

        "services",
@@ -51,6 +52,7 @@ android_test { 
    name: "TelecomUnitTests",

    static_libs: [

        "android-ex-camera2",

        "flag-junit",

        "guava",

        "mockito-target-extended",

        "androidx.test.rules",
@@ -61,6 +63,7 @@ android_test { 
        "androidx.fragment_fragment",

        "androidx.test.ext.junit",

        "platform-compat-test-rules",

        "telecom_flags_core_java_lib",

    ],

    srcs: [

        "tests/src/**/*.java",

AndroidManifest.xml

+0 −13
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
    <!-- Prevents the activity manager from delaying any activity-start

         requests by this package, including requests immediately after

         the user presses "home". -->

    <uses-permission android:name="android.permission.BIND_CONNECTION_SERVICE"/>

    <uses-permission android:name="android.permission.BIND_INCALL_SERVICE"/>

    <uses-permission android:name="android.permission.BLUETOOTH"/>

    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
@@ -319,18 +318,6 @@ 
             android:exported="false"

             android:process=":ui"/>



        <service android:name=".components.BluetoothPhoneService"

             android:singleUser="true"

             android:process="system"

             android:exported="true">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothHeadsetPhone"/>

            </intent-filter>

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothLeCallControlCallback" />

            </intent-filter>

        </service>



        <service android:name=".components.TelecomService"

             android:singleUser="true"

             android:process="system"

flags/Android.bp

0 → 100644
+43 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2023 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.

//



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



aconfig_declarations {

    name: "telecom_flags",

    package: "com.android.server.telecom.flags",

    srcs: [

      "telecom_broadcast_flags.aconfig",

      "telecom_ringer_flag_declarations.aconfig",

      "telecom_api_flags.aconfig",

      "telecom_call_filtering_flags.aconfig",

      "telecom_incallservice_flags.aconfig",

      "telecom_default_phone_account_flags.aconfig",

      "telecom_callaudioroutestatemachine_flags.aconfig",

      "telecom_call_flags.aconfig",

      "telecom_calls_manager_flags.aconfig",

      "telecom_anomaly_report_flags.aconfig",

      "telecom_callaudiomodestatemachine_flags.aconfig",

      "telecom_calllog_flags.aconfig",

      "telecom_resolve_hidden_dependencies.aconfig",

      "telecom_bluetoothroutemanager_flags.aconfig",

      "telecom_work_profile_flags.aconfig",

      "telecom_connection_service_wrapper_flags.aconfig",

    ],

}

flags/telecom_anomaly_report_flags.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.server.telecom.flags"



flag {

  name: "gen_anom_report_on_focus_timeout"

  namespace: "telecom"

  description: "When getCurrentFocusCall times out, generate an anom. report"

  bug: "309541253"

}

flags/telecom_api_flags.aconfig

0 → 100644
+29 −0
Original line number Diff line number Diff line 
package: "com.android.server.telecom.flags"



flag {

  name: "voip_app_actions_support"

  namespace: "telecom"

  description: "When set, Telecom support for additional VOIP application actions is active."

  bug: "296934278"

}



flag {

  name: "call_details_id_changes"

  namespace: "telecom"

  description: "When set, call details/extras id updates to Telecom APIs for Android V are active."

  bug: "301713560"

}



flag {

  name: "unbind_timeout_connections"

  namespace: "telecom"

  description: "When set, Telecom will auto-unbind if a ConnectionService returns no connections after some time."

  bug: "293458004"

}



flag{

  name: "add_call_uri_for_missed_calls"

  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"

}