diff options
| author | Wink Saville <wink@google.com> | 2014-02-13 04:26:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-13 04:26:33 +0000 |
| commit | bba3a694b8400fd340c0400bf42ef3d79a4285b1 (patch) | |
| tree | 14c1eb67ea3a2520670bf5910d06811982b1522a /core/res | |
| parent | a9bb594da6aff97ba927ba67a34486d0b9c1b4a0 (diff) | |
| parent | c5ac15a3e11c03951e269b243674858411204b67 (diff) | |
| download | frameworks_base-bba3a694b8400fd340c0400bf42ef3d79a4285b1.zip frameworks_base-bba3a694b8400fd340c0400bf42ef3d79a4285b1.tar.gz frameworks_base-bba3a694b8400fd340c0400bf42ef3d79a4285b1.tar.bz2 | |
Merge "Telephony API extension v2"
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b198937..8355928 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1088,6 +1088,14 @@ android:label="@string/permlab_readPhoneState" android:description="@string/permdesc_readPhoneState" /> + <!-- Allows read only access to precise phone state. + @hide Pending API council approval --> + <permission android:name="android.permission.READ_PRECISE_PHONE_STATE" + android:permissionGroup="android.permission-group.PHONE_CALLS" + android:protectionLevel="dangerous" + android:label="@string/permlab_readPrecisePhoneState" + android:description="@string/permdesc_readPrecisePhoneState" /> + <!-- Allows read access to privileged phone state. @hide Used internally. --> <permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 986a005..012fb83 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1639,6 +1639,14 @@ connected by a call.</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_readPrecisePhoneState">read precise phone states</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_readPrecisePhoneState">Allows the app to access the precise + phone states. This permission allows the app to determine the real + call status, whether a call is active or in the background, call fails, + precise data connection status and data connection fails.</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_wakeLock" product="tablet">prevent tablet from sleeping</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_wakeLock" product="default">prevent phone from sleeping</string> |