commit b63b57e2c35c4769e756f47131c7ebbc0af42c59
author Ihab Awad <ihab@google.com> Sun Mar 22 22:12:28 2015 -0700
committer Ihab Awad <ihab@google.com> Wed Apr 01 15:17:01 2015 -0700
tree 5827d3948d4a7488c05793801070f5569fb65b74
parent 226ae567a63a3ae8dd5292b127d59abf107417f4

Further cleanup, and move functionality into TestFixture objects

Change-Id: I62b514ae8fe10f720a60c681968efd2340616eba

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index e987dee..0c632ec 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -19,11 +19,13 @@
           package="com.android.server.telecom.tests"
           android:debuggable="true">
 
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" />
-    <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
-    <uses-permission android:name="android.permission.REGISTER_CONNECTION_MANAGER" />
-    <uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" />
+    <!-- TODO: Needed because we call BluetoothAdapter.getDefaultAdapter() statically, and
+         BluetoothAdapter is a final class. -->
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+
+    <!-- TODO: Needed because we call ActivityManager.getCurrentUser() statically. -->
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+    <uses-permission android:name="android.permission.MANAGE_USERS" />
 
     <application android:label="@string/app_name"
                  android:debuggable="true">
@@ -130,7 +132,7 @@
                                 -e com.android.server.telecom.tests.unit.FooUnitTest
     -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-            android:targetPackage="com.android.server.telecom"
-            android:label="Telecomm application tests."
+            android:targetPackage="com.android.server.telecom.tests"
+            android:label="Telecomm application tests"
             android:debuggable="true"/>
 </manifest>