diff options
| author | Jeff Davidson <jpd@google.com> | 2014-11-18 02:30:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 02:30:54 +0000 |
| commit | c79924f7412d527f640595bc2ad9f2ab631e83b7 (patch) | |
| tree | ba12845075ad64b9d88db90f927a6b4943eb697f /packages | |
| parent | f7d0b20e9ed5727a9b9b1a0c0cc4fc7383a7859f (diff) | |
| parent | b431a198ec255be7efb30b4c81a779a4eb5009f6 (diff) | |
| download | frameworks_base-c79924f7412d527f640595bc2ad9f2ab631e83b7.zip frameworks_base-c79924f7412d527f640595bc2ad9f2ab631e83b7.tar.gz frameworks_base-c79924f7412d527f640595bc2ad9f2ab631e83b7.tar.bz2 | |
am b431a198: am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev
* commit 'b431a198ec255be7efb30b4c81a779a4eb5009f6':
Enforce VPN control "permission" with an actual permission.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | packages/VpnDialogs/AndroidManifest.xml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index b3e60d1..5f024ac 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -55,6 +55,7 @@ <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" /> <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> <uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY" /> + <uses-permission android:name="android.permission.CONTROL_VPN" /> <!-- Physical hardware --> <uses-permission android:name="android.permission.MANAGE_USB" /> diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml index 03d920a..375c5d8 100644 --- a/packages/VpnDialogs/AndroidManifest.xml +++ b/packages/VpnDialogs/AndroidManifest.xml @@ -19,6 +19,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.vpndialogs"> + <uses-permission android:name="android.permission.CONTROL_VPN" /> + <application android:label="VpnDialogs" android:allowBackup="false" > <activity android:name=".ConfirmDialog" |