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

Commit b8957884 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Using applicationId instead of packageName for xml substitution for...

Merge "Using applicationId instead of packageName for xml substitution for increased compatibility" into main
parents a7d2658d 29586169
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -52,18 +52,18 @@
    name in the permissions. eq com.mypackage.permission.READ_SETTINGS
    -->
    <permission
        android:name="${packageName}.permission.READ_SETTINGS"
        android:name="${applicationId}.permission.READ_SETTINGS"
        android:protectionLevel="signatureOrSystem"
        android:label="@string/permlab_read_settings"
        android:description="@string/permdesc_read_settings"/>
    <permission
        android:name="${packageName}.permission.WRITE_SETTINGS"
        android:name="${applicationId}.permission.WRITE_SETTINGS"
        android:protectionLevel="signatureOrSystem"
        android:label="@string/permlab_write_settings"
        android:description="@string/permdesc_write_settings"/>

    <uses-permission android:name="${packageName}.permission.READ_SETTINGS" />
    <uses-permission android:name="${packageName}.permission.WRITE_SETTINGS" />
    <uses-permission android:name="${applicationId}.permission.READ_SETTINGS" />
    <uses-permission android:name="${applicationId}.permission.WRITE_SETTINGS" />

    <application
        android:backupAgent="com.android.launcher3.LauncherBackupAgent"
@@ -126,10 +126,10 @@
        -->
        <provider
            android:name="com.android.launcher3.LauncherProvider"
            android:authorities="${packageName}.settings"
            android:authorities="${applicationId}.settings"
            android:exported="true"
            android:writePermission="${packageName}.permission.WRITE_SETTINGS"
            android:readPermission="${packageName}.permission.READ_SETTINGS" />
            android:writePermission="${applicationId}.permission.WRITE_SETTINGS"
            android:readPermission="${applicationId}.permission.READ_SETTINGS" />

        <!--
        The content provider for exposing various launcher grid options.
@@ -137,7 +137,7 @@
        -->
        <provider
            android:name="com.android.launcher3.graphics.GridCustomizationsProvider"
            android:authorities="${packageName}.grid_control"
            android:authorities="${applicationId}.grid_control"
            android:exported="true" />

        <!--
@@ -157,7 +157,7 @@

        <provider
            android:name="com.android.launcher3.testing.TestInformationProvider"
            android:authorities="${packageName}.TestInfo"
            android:authorities="${applicationId}.TestInfo"
            android:readPermission="android.permission.WRITE_SECURE_SETTINGS"
            android:writePermission="android.permission.WRITE_SECURE_SETTINGS"
            android:exported="true"
+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@
    <uses-permission android:name="android.permission.ACCESS_HIDDEN_PROFILES_FULL" />

    <!-- Permission required to start a WidgetPickerActivity. -->
    <permission android:name="${packageName}.permission.START_WIDGET_PICKER_ACTIVITY"
    <permission android:name="${applicationId}.permission.START_WIDGET_PICKER_ACTIVITY"
        android:protectionLevel="signature|privileged" />

    <application android:backupAgent="com.android.launcher3.LauncherBackupAgent"
@@ -88,7 +88,7 @@

        <!-- Content provider to settings search. The autority should be same as the packageName -->
        <provider android:name="com.android.quickstep.LauncherSearchIndexablesProvider"
             android:authorities="${packageName}"
             android:authorities="${applicationId}"
             android:grantUriPermissions="true"
             android:multiprocess="true"
             android:permission="android.permission.READ_SEARCH_INDEXABLES"
@@ -100,7 +100,7 @@

        <!-- FileProvider used for sharing images. -->
        <provider android:name="androidx.core.content.FileProvider"
             android:authorities="${packageName}.overview.fileprovider"
             android:authorities="${applicationId}.overview.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
            <meta-data android:name="android.support.FILE_PROVIDER_PATHS"