Merge "Add a new permission for user space VPN applications."

        android:description="@string/permdesc_nfc"

        android:label="@string/permlab_nfc" />

    <!-- Allows applications to provide VPN functionality.

         @hide Pending API council approval -->

    <permission android:name="android.permission.VPN"

        android:permissionGroup="android.permission-group.NETWORK"

        android:protectionLevel="dangerous"

        android:description="@string/permdesc_vpn"

        android:label="@string/permlab_vpn" />

    <!-- Allows an application to use SIP service -->

    <permission android:name="android.permission.USE_SIP"

        android:permissionGroup="android.permission-group.NETWORK"

    <string name="permdesc_nfc">Allows an application to communicate

      with Near Field Communication (NFC) tags, cards, and readers.</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_vpn">intercept and modify all network traffic</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_vpn">Allows an application to intercept and

      inspect all network traffic, for example to establish a VPN connection.

      Malicious applications may monitor, redirect, or modify network packets

      without your knowledge.</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_disableKeyguard">disable keylock</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->