diff options
| author | fredc <fredc@broadcom.com> | 2012-04-12 00:02:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-16 21:20:54 -0700 |
| commit | 0f42037eb7b5118015c2caca635538324ccf0ccf (patch) | |
| tree | 46a7ba36216a2cb617541ec68f18b413419e148f /data | |
| parent | 919a4c6264b733585152ce1dc6f868c1093d368b (diff) | |
| download | frameworks_base-0f42037eb7b5118015c2caca635538324ccf0ccf.zip frameworks_base-0f42037eb7b5118015c2caca635538324ccf0ccf.tar.gz frameworks_base-0f42037eb7b5118015c2caca635538324ccf0ccf.tar.bz2 | |
Non persistent adapter service
Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5
Conflicts:
core/java/android/bluetooth/BluetoothInputDevice.java
Conflicts:
core/java/com/android/internal/app/ShutdownThread.java
services/java/com/android/server/SystemServer.java
Conflicts:
services/java/com/android/server/SystemServer.java
services/java/com/android/server/pm/ShutdownThread.java
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/platform.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 4b93e74..38a75b6 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -42,6 +42,10 @@ <group gid="net_bt" /> </permission> + <permission name="android.permission.NET_TUNNELING" > + <group gid="vpn" /> + </permission> + <permission name="android.permission.INTERNET" > <group gid="inet" /> </permission> |