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

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

Merge Android 12 

Bug: 202323961
Merged-In: Icc0b695c320d81ca5c0bfbaf7c1fac9a45f9699c
Change-Id: I0320e69ab2be599608cf036538ef03196ddf0bc9
parents 24ad325b 63628115

AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
    <uses-permission android:name="android.permission.READ_CALL_LOG"/>

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

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

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

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

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

    <uses-permission android:name="android.permission.VIBRATE"/>
@@ -165,6 +166,7 @@ 
        <activity-alias android:name="PrivilegedCallActivity"

             android:targetActivity=".components.UserCallActivity"

             android:permission="android.permission.CALL_PRIVILEGED"

             android:exported="true"

             android:process=":ui">

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

                <action android:name="android.intent.action.CALL_PRIVILEGED"/>
@@ -200,6 +202,7 @@ 
        <activity-alias android:name="EmergencyCallActivity"

             android:targetActivity=".components.UserCallActivity"

             android:permission="android.permission.CALL_PRIVILEGED"

             android:exported="true"

             android:process=":ui">

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

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

res/values-ar/config.xml

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

<!--  Copyright (C) 2014 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.

 -->



<!--  Telecomm resources that may need to be customized for different hardware or product

    builds.  -->



<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="call_diagnostic_service_package_name" msgid="2953253648590374717"></string>

</resources>

res/values-as/config.xml

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

<!--  Copyright (C) 2014 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.

 -->



<!--  Telecomm resources that may need to be customized for different hardware or product

    builds.  -->



<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="call_diagnostic_service_package_name" msgid="2953253648590374717"></string>

</resources>

res/values-az/config.xml

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

<!--  Copyright (C) 2014 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.

 -->



<!--  Telecomm resources that may need to be customized for different hardware or product

    builds.  -->



<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="call_diagnostic_service_package_name" msgid="2953253648590374717"></string>

</resources>

res/values-b+sr+Latn/config.xml

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

<!--  Copyright (C) 2014 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.

 -->



<!--  Telecomm resources that may need to be customized for different hardware or product

    builds.  -->



<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="call_diagnostic_service_package_name" msgid="2953253648590374717"></string>

</resources>