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

Commit b3a412e4 authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q4 into AOSP main 

Bug: 370570306
Merged-In: I13a4ed323416d2887f5e9b2f38a7d4e34871c9d3
Change-Id: I76c0605d90acf6d07cbb8529bf3bcd0776ec6073
parents 77018409 97ae557a

AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
    <!-- Required to determine source of ongoing audio recordings. -->

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

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

    <!-- Required to query the audio framework to determine if a notification sound should play. -->

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

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

    <!-- Required to check for direct to voicemail, to load custom ringtones for incoming calls

        which are specified on a per contact basis, and also to determine user preferred
@@ -66,7 +68,6 @@ 
    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>

    <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"
@@ -136,7 +137,7 @@ 
                         contacts provider entries. Any data not fitting the schema described is ignored. -->

        <activity android:name=".components.UserCallActivity"

             android:label="@string/userCallActivityLabel"

             android:theme="@style/Theme.Telecomm.Transparent"

             android:theme="@style/Theme.Telecomm.UserCallActivityNoSplash"

             android:permission="android.permission.CALL_PHONE"

             android:excludeFromRecents="true"

             android:process=":ui"

TEST_MAPPING

+10 −0
Original line number Diff line number Diff line
@@ -58,5 +58,15 @@ 
        }

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "CtsTelecomCujTestCases",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    }

  ]

}

flags/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -43,5 +43,7 @@ aconfig_declarations { 
        "telecom_profile_user_flags.aconfig",

        "telecom_bluetoothdevicemanager_flags.aconfig",

        "telecom_non_critical_security_flags.aconfig",

        "telecom_headless_system_user_mode.aconfig",

        "telecom_metrics_flags.aconfig",

    ],

}

flags/telecom_anomaly_report_flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -8,3 +8,11 @@ flag { 
  description: "When getCurrentFocusCall times out, generate an anom. report"

  bug: "309541253"

}



# OWNER=tjstuart TARGET=25Q2

flag {

  name: "disconnect_self_managed_stuck_startup_calls"

  namespace: "telecom"

  description: "If a self-managed call is stuck in certain states, disconnect it"

  bug: "360298368"

}

flags/telecom_call_filtering_flags.aconfig

+12 −1
Original line number Diff line number Diff line
@@ -8,3 +8,14 @@ flag { 
  description: "Gates whether to still perform Dnd filter when phone account has skip_filter call extra."

  bug: "222333869"

}



# OWNER=tjstuart TARGET=25Q1

flag {

  name: "check_completed_filters_on_timeout"

  namespace: "telecom"

  description: "If the Filtering Graph times out, combine the finished results"

  bug: "364946812"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}