summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Thomas Nguyen <tnd@google.com> 2023-04-18 16:32:39 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-04-18 16:32:39 +0000
commit2b7011a15c40e827f297f428bd04d13612ae79cf (patch)
tree910a7b8a80a037750d73ea056495cbc741ead75f
parent06535b8bcfbebd607ea1aa51f05bcc44dc2e3865 (diff)
parenta78a1ee1c45c408b72b4c77789be3b161184c966 (diff)
Merge "Allow platform app and privileged apps to access satellite apis" into udc-dev
-rw-r--r--core/res/AndroidManifest.xml4
-rw-r--r--data/etc/privapp-permissions-platform.xml2
2 files changed, 4 insertions, 2 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1e18a98853bd..c928a82de32e 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -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 -->
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 8ece337971a9..40cb7f2194e9 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -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">