diff options
| author | Shishir Agrawal <shishir@google.com> | 2013-12-17 00:44:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-17 00:44:40 +0000 |
| commit | c4d41755d73ffe85d179d42a4f0c993b49303145 (patch) | |
| tree | fc3f10c698b16e2cad8ec8479001bb2e7a48c9e4 /core/res | |
| parent | 6d384403d7c827692d4c97a636c49264b88210a9 (diff) | |
| parent | 57f656b9f6271cf857b5ecec5f8c7eacb321ec0b (diff) | |
| download | frameworks_base-c4d41755d73ffe85d179d42a4f0c993b49303145.zip frameworks_base-c4d41755d73ffe85d179d42a4f0c993b49303145.tar.gz frameworks_base-c4d41755d73ffe85d179d42a4f0c993b49303145.tar.bz2 | |
Merge "Adding support for SIM communication from Android over logical channels."
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 6de7a40..ca74fa4 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -989,6 +989,14 @@ android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="signature" /> + <!-- Allows an application to communicate with a SIM card using logical + channels. --> + <permission android:name="android.permission.SIM_COMMUNICATION" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:label="@string/permlab_sim_communication" + android:description="@string/permdesc_sim_communication" + android:protectionLevel="dangerous" /> + <!-- =========================================== --> <!-- Permissions associated with audio capture --> <!-- =========================================== --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9a850b1..bbe3909 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1484,6 +1484,11 @@ without your confirmation.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_sim_communication">sim communication</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_sim_communication">Allows the app to send commands to the SIM. This is very dangerous.</string> + + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_camera">take pictures and videos</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_camera">Allows the app to take pictures and videos |