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

Commit 057139f7 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '2852-u-microg' into 'v1-u' 

Fix permission manager stuck in loading state

See merge request e/os/android_frameworks_base!253
parents 529c8a87 54e353b4

core/api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ package android { 
    field public static final String EXECUTE_APP_ACTION = "android.permission.EXECUTE_APP_ACTION";

    field public static final String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR";

    field public static final String FACTORY_TEST = "android.permission.FACTORY_TEST";

    field public static final String FAKE_PACKAGE_SIGNATURE = "android.permission.FAKE_PACKAGE_SIGNATURE";

    field public static final String FOREGROUND_SERVICE = "android.permission.FOREGROUND_SERVICE";

    field public static final String FOREGROUND_SERVICE_CAMERA = "android.permission.FOREGROUND_SERVICE_CAMERA";

    field public static final String FOREGROUND_SERVICE_CONNECTED_DEVICE = "android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE";
@@ -344,7 +343,6 @@ package android { 
    field public static final String CALL_LOG = "android.permission-group.CALL_LOG";

    field public static final String CAMERA = "android.permission-group.CAMERA";

    field public static final String CONTACTS = "android.permission-group.CONTACTS";

    field public static final String FAKE_PACKAGE = "android.permission-group.FAKE_PACKAGE";

    field public static final String LOCATION = "android.permission-group.LOCATION";

    field public static final String MICROPHONE = "android.permission-group.MICROPHONE";

    field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES";

core/api/lint-baseline.txt

+0 −4
Original line number Diff line number Diff line
@@ -1169,10 +1169,6 @@ UnflaggedApi: android.R.dimen#system_corner_radius_xlarge: 
    New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_xlarge

UnflaggedApi: android.R.dimen#system_corner_radius_xsmall:

    New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_xsmall

UnflaggedApi: android.Manifest.permission#FAKE_PACKAGE_SIGNATURE:

    New API must be flagged with @FlaggedApi: field android.Manifest.permission.FAKE_PACKAGE_SIGNATURE

UnflaggedApi: android.Manifest.permission_group#FAKE_PACKAGE:

    New API must be flagged with @FlaggedApi: field android.Manifest.permission_group.FAKE_PACKAGE

UnflaggedApi: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INTERNAL_ERROR:

    New API must be flagged with @FlaggedApi: field android.accessibilityservice.AccessibilityService.OVERLAY_RESULT_INTERNAL_ERROR

UnflaggedApi: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INVALID:

core/res/AndroidManifest.xml

+0 −15
Original line number Diff line number Diff line
@@ -4481,21 +4481,6 @@ 
        android:description="@string/permdesc_getPackageSize"

        android:protectionLevel="normal" />



    <!-- Dummy user-facing group for faking package signature -->

    <permission-group android:name="android.permission-group.FAKE_PACKAGE"

        android:label="@string/permgrouplab_fake_package_signature"

        android:description="@string/permgroupdesc_fake_package_signature"

        android:request="@string/permgrouprequest_fake_package_signature"

        android:priority="100" />



    <!-- Allows an application to change the package signature as

         seen by applications -->

    <permission android:name="android.permission.FAKE_PACKAGE_SIGNATURE"

        android:permissionGroup="android.permission-group.UNDEFINED"

        android:protectionLevel="signature|privileged"

        android:label="@string/permlab_fakePackageSignature"

        android:description="@string/permdesc_fakePackageSignature" />



    <!-- @deprecated No longer useful, see

         {@link android.content.pm.PackageManager#addPackageToPreferred}

         for details. -->

core/res/res/values-de/e_strings.xml

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

<!--

  ~ Copyright Murena SAS 2023

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  -->

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

    <string name="permlab_fakePackageSignature">Paketsignatur-Täuschung</string>

    <string name="permdesc_fakePackageSignature">Erlaubt der App vorzutäuschen, eine andere App zu sein. Bösartige Anwendungen könnten diese Berechtigung missbrauchen, um private App-Daten zu entwenden. Berechtigte Benutzung wäre von einem Emulator, der vortäuscht, was er emuliert. Gewähre diese Berechtigung mit Vorsicht!</string>

    <string name="permgrouplab_fake_package_signature">Paketsignatur-Täuschung</string>

    <string name="permgroupdesc_fake_package_signature">Paketsignatur-Täuschung zulassen</string>

    <string name="permgrouprequest_fake_package_signature">&lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; erlauben, die Paketsignatur zu fälschen\?</string>

</resources>
 
 No newline at end of file

core/res/res/values-fr/e_strings.xml

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

<!--

  ~ Copyright Murena SAS 2023

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  -->

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

    <string name="permlab_fakePackageSignature">Usurper la signature de paquets</string>

    <string name="permdesc_fakePackageSignature">Autoriser l\'application à prétendre qu\'elle est une autre application. Des applications frauduleuses pourraient utiliser cette autorisation pour accéder à des données d\'application privées. Les usages légitimes incluent un émulateur prétendant être ce qu\'il émule. N\'accordez cette autorisation qu\'avec parcimonie !</string>

    <string name="permgrouplab_fake_package_signature">Usurper la signature de paquets</string>

    <string name="permgroupdesc_fake_package_signature">Autoriser l\'usurpation de la signature de paquets</string>

    <string name="permgrouprequest_fake_package_signature">Autoriser &lt;b&gt;<xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b&gt; à usurper la signature de paquets \?</string>

</resources>
 
 No newline at end of file