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

Commit 8cf16f86 authored by Thomas Nguyen's avatar Thomas Nguyen Committed by Automerger Merge Worker
Browse files

Merge "Allow platform app and privileged apps to access satellite apis" into... 

Merge "Allow platform app and privileged apps to access satellite apis" into udc-dev am: 2b7011a1 am: 69a3cdac

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22454970



Change-Id: Iddcdb1e109dc3983a15eb8b93ff95f6a2eac3689
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb7878d1 69a3cdac

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -1036,9 +1036,9 @@ 
        android:protectionLevel="dangerous" />



    <!-- @SystemApi @hide Allows an application to communicate over satellite.

         Only granted if the application is a system app. -->

         Only granted if the application is a system app or privileged app. -->

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

                android:protectionLevel="internal|role" />

                android:protectionLevel="role|signature|privileged" />



    <!-- ====================================================================== -->

    <!-- Permissions for accessing external storage                             -->

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -518,6 +518,8 @@ applications that come with the platform 
        <permission name="android.permission.LOG_FOREGROUND_RESOURCE_USE"/>

        <!-- Permission required for CTS test - CtsVoiceInteractionTestCases -->

        <permission name="android.permission.SOUND_TRIGGER_RUN_IN_BATTERY_SAVER"/>

        <!-- Permission required for CTS test - SatelliteManagerTest -->

        <permission name="android.permission.SATELLITE_COMMUNICATION"/>

    </privapp-permissions>



    <privapp-permissions package="com.android.statementservice">