diff options
| author | scheib <scheib@chromium.org> | 2015-05-11 17:09:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-12 00:10:39 +0000 |
| commit | 4261538f2e98c39395931e9e79fc5a3a4ddbf23f (patch) | |
| tree | 84904cca6f6c715e83f0af4e41e8df57f263c28a /testing/android | |
| parent | 7cdcf50b4ae3858f5132a1bb0d4cb5e104527b42 (diff) | |
| download | chromium_src-4261538f2e98c39395931e9e79fc5a3a4ddbf23f.zip chromium_src-4261538f2e98c39395931e9e79fc5a3a4ddbf23f.tar.gz chromium_src-4261538f2e98c39395931e9e79fc5a3a4ddbf23f.tar.bz2 | |
bluetooth: Android adapter can be created with and without Bluetooth permission.
This enables unit tests to run with Bluetooth permission,
by adding the Bluetooth permission to native_test.
Non-test applications will not have the Bluetooth permission,
and unit tests should also verify behavior
when the permission is not given. To enable this
createWithoutPermissionForTesting is added and
results in a state equivalent to when the permission
is not available.
Unit tests will be built in parallel for both when Bluetooth
permission exists and doesn't.
BUG=471536
Committed: https://crrev.com/30e81472dc168ea1c331a8779b3f6a14f684c54b
Cr-Commit-Position: refs/heads/master@{#329212}
Review URL: https://codereview.chromium.org/1129683002
Cr-Commit-Position: refs/heads/master@{#329286}
Diffstat (limited to 'testing/android')
| -rw-r--r-- | testing/android/native_test/java/AndroidManifest.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/testing/android/native_test/java/AndroidManifest.xml b/testing/android/native_test/java/AndroidManifest.xml index a92fb5f..37cc82d 100644 --- a/testing/android/native_test/java/AndroidManifest.xml +++ b/testing/android/native_test/java/AndroidManifest.xml @@ -11,7 +11,8 @@ found in the LICENSE file. android:versionName="1.0"> <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" /> - + <uses-permission android:name="android.permission.BLUETOOTH"/> + <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> |