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

Commit 4953fbcf authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 12"

parents a85c99c7 69a6bcc6

java/com/android/contacts/common/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    <activity

      android:name="com.android.contacts.common.dialog.CallSubjectDialog"

      android:theme="@style/Theme.CallSubjectDialogTheme"

      android:exported="true"

      android:windowSoftInputMode="stateVisible|adjustResize">

      <intent-filter>

        <action android:name="android.intent.action.VIEW"/>

java/com/android/dialer/app/AndroidManifest.xml

+4 −1
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ 
      android:theme="@style/DialtactsTheme">

    </activity>



    <receiver android:name="com.android.dialer.app.calllog.CallLogReceiver">

    <receiver android:name="com.android.dialer.app.calllog.CallLogReceiver"

        android:exported="true">

      <intent-filter>

        <action android:name="android.intent.action.NEW_VOICEMAIL"/>

        <data
@@ -115,6 +116,7 @@ 


    <receiver

      android:directBootAware="true"

      android:exported="true"

      android:name="com.android.dialer.app.calllog.MissedCallNotificationReceiver">

      <intent-filter>

        <action android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION"/>
@@ -122,6 +124,7 @@ 
    </receiver>

    <!-- Handles voicemail notifications from telephony. Requires O -->

    <receiver android:name=".voicemail.LegacyVoicemailNotificationReceiver"

      android:exported="true"

      android:directBootAware="true">

      <intent-filter>

        <action android:name="android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION"/>

java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
        android:label="@string/assisted_dialing_setting_title"

        android:name=".AssistedDialingSettingActivity"

        android:parentActivityName="com.android.dialer.app.settings.DialerSettingsActivity"

        android:exported="true"

        android:theme="@style/SettingsStyle">

      <intent-filter>

        <action android:name="com.android.dialer.app.settings.SHOW_ASSISTED_DIALING_SETTINGS"/>

java/com/android/dialer/interactions/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
      android:exported="false"

      android:name="com.android.dialer.interactions.ContactUpdateService"/>



    <receiver android:name="com.android.dialer.interactions.UndemoteOutgoingCallReceiver">

    <receiver android:name="com.android.dialer.interactions.UndemoteOutgoingCallReceiver"

        android:exported="true">

      <intent-filter>

        <action android:name="android.intent.action.NEW_OUTGOING_CALL"/>

      </intent-filter>

java/com/android/incallui/answer/impl/hint/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
  xmlns:android="http://schemas.android.com/apk/res/android">



  <application>

    <receiver android:name=".PawSecretCodeListener">

    <receiver android:name=".PawSecretCodeListener"

        android:exported="true">

      <intent-filter>

        <action android:name="android.provider.Telephony.SECRET_CODE" />

        <data android:scheme="android_secret_code" />