diff options
| author | Andres Morales <anmorales@google.com> | 2014-06-25 22:23:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-25 17:34:05 +0000 |
| commit | d96e4948daf687f3f631ba8d93c89026fd3ce272 (patch) | |
| tree | c10c482755a6b793dc826c1fbbedaf757f8fd109 /core/res | |
| parent | 533226a318d74f9ee20a5ec80cd0c7c06dc91467 (diff) | |
| parent | 9740e468bc895cbc08c71aecc35fc56c3faafa06 (diff) | |
| download | frameworks_base-d96e4948daf687f3f631ba8d93c89026fd3ce272.zip frameworks_base-d96e4948daf687f3f631ba8d93c89026fd3ce272.tar.gz frameworks_base-d96e4948daf687f3f631ba8d93c89026fd3ce272.tar.bz2 | |
Merge "interface for nfc handover supplicant commands"
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 18 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 3 |
2 files changed, 17 insertions, 4 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 53f46eb..ca897d5 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -156,16 +156,12 @@ android:name="android.bluetooth.pan.profile.action.CONNECTION_STATE_CHANGED" /> <protected-broadcast android:name="android.bluetooth.pbap.intent.action.PBAP_STATE_CHANGED" /> <protected-broadcast android:name="android.btopp.intent.action.INCOMING_FILE_NOTIFICATION" /> - <protected-broadcast android:name="android.btopp.intent.action.BT_OPP_HANDOVER_STARTED" /> - <protected-broadcast android:name="android.btopp.intent.action.TRANSFER_COMPLETE" /> <protected-broadcast android:name="android.btopp.intent.action.USER_CONFIRMATION_TIMEOUT" /> - <protected-broadcast android:name="android.btopp.intent.action.BT_OPP_TRANSFER_PROGRESS" /> <protected-broadcast android:name="android.btopp.intent.action.LIST" /> <protected-broadcast android:name="android.btopp.intent.action.OPEN_OUTBOUND" /> <protected-broadcast android:name="android.btopp.intent.action.HIDE_COMPLETE" /> <protected-broadcast android:name="android.btopp.intent.action.CONFIRM" /> <protected-broadcast android:name="android.btopp.intent.action.HIDE" /> - <protected-broadcast android:name="android.btopp.intent.action.BT_OPP_TRANSFER_DONE" /> <protected-broadcast android:name="android.btopp.intent.action.RETRY" /> <protected-broadcast android:name="android.btopp.intent.action.OPEN" /> <protected-broadcast android:name="android.btopp.intent.action.OPEN_INBOUND" /> @@ -284,7 +280,13 @@ <protected-broadcast android:name="android.intent.action.PERMISSION_RESPONSE_RECEIVED" /> <!-- Defined in RestrictionsManager --> + <protected-broadcast android:name="android.intent.action.REQUEST_PERMISSION" /> + <protected-broadcast android:name="android.nfc.handover.intent.action.HANDOVER_STARTED" /> + <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_DONE" /> + <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_PROGRESS" /> + <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_DONE" /> + <!-- ====================================== --> <!-- Permissions for things that cost money --> @@ -877,6 +879,14 @@ android:permissionGroup="android.permission-group.NETWORK" android:protectionLevel="signature|system" /> + <!-- Allows sending and receiving handover transfer status from Wifi and Bluetooth + @hide + --> + <permission android:name="android.permission.NFC_HANDOVER_STATUS" + android:label="@string/permlab_handoverStatus" + android:description="@string/permdesc_handoverStatus" + android:protectionLevel="signature|system" /> + <!-- ================================== --> <!-- Permissions for accessing accounts --> <!-- ================================== --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 3da6669..7d474a4 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2137,6 +2137,9 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_accessDrmCertificates">Allows an application to provision and use DRM certficates. Should never be needed for normal apps.</string> + <string name="permlab_handoverStatus">Receive handover transfer broadcasts.</string> + <string name="permdesc_handoverStatus">Allows receiving handover transfer status information.</string> + <!-- Policy administration --> <!-- Title of policy access to limiting the user's password choices --> |