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

Commit 92f82f37 authored by Michael W's avatar Michael W
Browse files

Dialer: Target current SDK 

Since compiler complained about multiple declarations and it's not
worth figuring out the duplicate definitions, just merge the manifests
into one

Change-Id: I1f9ad46d65144fc1cbbceacfdf4adf089e7e4a03
parent 28bf17e0

Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -96,10 +96,6 @@ android_app { 
        "--extra-packages com.android.voicemail.impl",

        "--extra-packages com.android.voicemail.impl.configui",

    ],

    additional_manifests: [

        "assets/quantum/AndroidManifest.xml",

        "java/**/AndroidManifest.xml",

    ],

    aidl: {

        local_include_dirs: ["java"],

    },

AndroidManifest.xml

+734 −103

File changed.

Preview size limit exceeded, changes collapsed.

assets/quantum/AndroidManifest.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2017 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 xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.google.android.assets.quantum">

  <uses-sdk android:targetSdkVersion="30" />

  <application/>

</manifest>

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

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
<!-- Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"

  package="com.android.contacts.common">



  <application>



    <activity

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

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

      android:exported="false"

      android:windowSoftInputMode="stateVisible|adjustResize">

      <intent-filter>

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

      </intent-filter>

    </activity>



    <!-- Broadcast receiver that passively listens to location updates -->

    <receiver android:name="com.android.dialer.location.CountryDetector$LocationChangedReceiver"/>

  </application>

</manifest>

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

deleted100644 → 0
+0 −159
Original line number Diff line number Diff line 
<!-- Copyright (C) 2016 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 xmlns:android="http://schemas.android.com/apk/res/android"

  package="com.android.dialer.app">



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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"/>

  <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>

  <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL"/>

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

  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>

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

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

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



  <!-- This tells the activity manager to not delay any of our activity

   start requests, even if they happen immediately after the user

   presses home. -->

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



  <uses-sdk

    android:minSdkVersion="24"

    android:targetSdkVersion="30"/>



  <application>



    <activity

      android:label="@string/call_log_activity_title"

      android:name="com.android.dialer.app.calllog.CallLogActivity"

      android:theme="@style/DialtactsTheme">

    </activity>



    <activity android:name="com.android.dialer.app.AccountSelectionActivity"

      android:theme="@style/TransparentTheme"

      android:exported="false" />



    <activity

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

        android:exported="false"

        android:label="@string/dialer_settings_label"

        android:parentActivityName="com.android.dialer.main.impl.MainActivity"

        android:theme="@style/SettingsStyle">

      <intent-filter>

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

        <category android:name="android.intent.category.DEFAULT"/>

        <data android:scheme="header"/>

      </intent-filter>

    </activity>



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

        android:exported="true">

      <intent-filter>

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

        <data

          android:host="com.android.voicemail"

          android:mimeType="vnd.android.cursor.item/voicemail"

          android:scheme="content"

          />

        <data

            android:host="com.android.voicemail"

            android:mimeType="vnd.android.cursor.dir/voicemails"

            android:scheme="content"

            />

      </intent-filter>

      <intent-filter android:priority="100">

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

      </intent-filter>

    </receiver>



    <activity

        android:name="com.android.dialer.app.calllog.CallLogNotificationsActivity"

        android:theme="@style/Theme.AppCompat.Translucent">

    </activity>



    <service

      android:directBootAware="true"

      android:exported="false"

      android:name="com.android.dialer.app.calllog.CallLogNotificationsService"

      />



    <service

      android:name="com.android.dialer.app.calllog.VoicemailNotificationJobService"

      android:permission="android.permission.BIND_JOB_SERVICE"

      />



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

      </intent-filter>

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

      </intent-filter>

      <intent-filter>

        <action android:name="com.android.voicemail.VoicemailClient.ACTION_SHOW_LEGACY_VOICEMAIL" />

      </intent-filter>

    </receiver>



    <provider

      android:authorities="com.android.dialer.files"

      android:exported="false"

      android:grantUriPermissions="true"

      android:name="androidx.core.content.FileProvider">

      <meta-data

        android:name="android.support.FILE_PROVIDER_PATHS"

        android:resource="@xml/file_paths"/>

    </provider>



    <provider xmlns:tools="http://schemas.android.com/tools"

        android:name="androidx.startup.InitializationProvider"

        android:authorities="${applicationId}.androidx-startup"

        android:exported="false"

        tools:replace="android:authorities"/>

    <meta-data android:name="supports_per_number_preferred_account" android:value="true" />

  </application>

</manifest>