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

Commit 4dffc62f authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 12"

parents 66273f82 a920c1b1

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>