Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move eUICC permissions to com.android namespace." into oc-dr1-dev

Browse Source 
am: 3fc57019bb

Change-Id: Ic29ac9c37bfd6c39fadd53ae57fb289a2f858d5e
This commit is contained in:
Jeff Davidson
2017-07-11 01:55:12 +00:00
committed by android-build-merger
parent 702d82fdc0 3fc57019bb
commit aa7f92dc6a
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/res/AndroidManifest.xml
View File

@@ -1705,19 +1705,18 @@
<!-- Allows an application to manage embedded subscriptions (those on a eUICC) through <!-- Allows an application to manage embedded subscriptions (those on a eUICC) through
EuiccManager APIs. EuiccManager APIs.
<p>Protection level: signature|privileged|development <p>Protection level: signature|privileged|development
TODO(b/35851809): Mark this as a SystemApi. TODO(b/35851809): Mark this as a SystemApi and remove com. prefix.
@hide --> @hide -->
<permission android:name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" <permission android:name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
android:protectionLevel="signature|privileged|development" /> android:protectionLevel="signature|privileged|development" />
<!-- Must be required by an EuiccService to ensure that only the system can bind to it. <!-- Must be required by an EuiccService to ensure that only the system can bind to it.
<p>Protection level: signature <p>Protection level: signature
TODO(b/35851809): Mark this as a SystemApi. TODO(b/35851809): Mark this as a SystemApi and remove com. prefix.
@hide --> @hide -->
<permission android:name="android.permission.BIND_EUICC_SERVICE" <permission android:name="com.android.permission.BIND_EUICC_SERVICE"
android:protectionLevel="signature" /> android:protectionLevel="signature" />
<!-- ================================== --> <!-- ================================== -->
<!-- Permissions for sdcard interaction --> <!-- Permissions for sdcard interaction -->
<!-- ================================== --> <!-- ================================== -->

2
data/etc/privapp-permissions-platform.xml
View File

@@ -162,8 +162,8 @@ applications that come with the platform
<permission name="android.permission.UPDATE_DEVICE_STATS"/> <permission name="android.permission.UPDATE_DEVICE_STATS"/>
<permission name="android.permission.UPDATE_LOCK"/> <permission name="android.permission.UPDATE_LOCK"/>
<permission name="android.permission.WRITE_APN_SETTINGS"/> <permission name="android.permission.WRITE_APN_SETTINGS"/>
<permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS"/> <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
<permission name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
<permission name="com.android.voicemail.permission.READ_VOICEMAIL"/> <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
<permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/> <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
</privapp-permissions> </privapp-permissions>