diff options
| author | Eric Rowe <erowe@google.com> | 2014-10-16 06:49:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 06:49:34 +0000 |
| commit | 1e684b3ded150281bea80f67fdfd3a87035a9e74 (patch) | |
| tree | 1e7bd9a9c83d42e534123b49fec34aa4040a1a9f | |
| parent | 2ecd9de2d5c43101fe86f9479710bab99bf9f3d6 (diff) | |
| parent | ea626e1af8019786d514d3de0b8a1fa274ca424c (diff) | |
| download | frameworks_base-1e684b3ded150281bea80f67fdfd3a87035a9e74.zip frameworks_base-1e684b3ded150281bea80f67fdfd3a87035a9e74.tar.gz frameworks_base-1e684b3ded150281bea80f67fdfd3a87035a9e74.tar.bz2 | |
am ea626e1a: am de96b966: am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev
* commit 'ea626e1af8019786d514d3de0b8a1fa274ca424c':
Add CHANGE_NETWORK_STATE permission to bt tests
| -rw-r--r-- | core/tests/bluetoothtests/AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/tests/bluetoothtests/AndroidManifest.xml b/core/tests/bluetoothtests/AndroidManifest.xml index cbfa84d..e43ba12 100644 --- a/core/tests/bluetoothtests/AndroidManifest.xml +++ b/core/tests/bluetoothtests/AndroidManifest.xml @@ -20,6 +20,7 @@ <uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BROADCAST_STICKY" /> + <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" /> |