Refactoring for testability
Refactor to a single app singleton, TelecomSystem, which owns the
intialization of the rest of the app.
Change-Id: I3036f200b56f710e7f830b469260a67145c327e7
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a2c0b91..9a47d30 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -75,7 +75,7 @@
contain contact information in the intent's data. CallActivity handles any data
URL with the schemes "tel", "sip", and "voicemail". It also handles URLs linked to
contacts provider entries. Any data not fitting the schema described is ignored. -->
- <activity android:name="CallActivity"
+ <activity android:name=".components.UserCallActivity"
android:theme="@style/Theme.Telecomm.Transparent"
android:permission="android.permission.CALL_PHONE"
android:excludeFromRecents="true"
@@ -114,7 +114,7 @@
processed. High priority of 1000 is used in all intent filters to prevent anything but
the system from processing this intent (b/8871505). -->
<activity-alias android:name="PrivilegedCallActivity"
- android:targetActivity="CallActivity"
+ android:targetActivity=".components.UserCallActivity"
android:permission="android.permission.CALL_PRIVILEGED"
android:process=":ui">
<intent-filter android:priority="1000">
@@ -149,7 +149,7 @@
<!-- TODO: Is there really a notion of an emergency SIP number? If not, can
that scheme be removed from this activity? -->
<activity-alias android:name="EmergencyCallActivity"
- android:targetActivity="CallActivity"
+ android:targetActivity=".components.UserCallActivity"
android:permission="android.permission.CALL_PRIVILEGED"
android:process=":ui">
<intent-filter android:priority="1000">
@@ -176,7 +176,7 @@
</intent-filter>
</activity-alias>
- <receiver android:name="TelecomBroadcastReceiver" android:exported="false"
+ <receiver android:name=".components.TelecomBroadcastReceiver" android:exported="false"
android:process="system">
<intent-filter>
<action android:name="com.android.server.telecom.ACTION_CALL_BACK_FROM_NOTIFICATION" />
@@ -185,7 +185,7 @@
</intent-filter>
</receiver>
- <receiver android:name="PhoneAccountBroadcastReceiver"
+ <receiver android:name=".components.PhoneAccountBroadcastReceiver"
android:process="system">
<intent-filter>
<action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
@@ -203,7 +203,7 @@
</intent-filter>
</activity>
- <activity android:name=".ErrorDialogActivity"
+ <activity android:name=".components.ErrorDialogActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:excludeFromRecents="true"
android:launchMode="singleInstance"
@@ -211,13 +211,13 @@
android:process=":ui">
</activity>
- <receiver android:name=".CallReceiver"
+ <receiver android:name=".components.PrimaryCallReceiver"
android:exported="true"
android:permission="android.permission.MODIFY_PHONE_STATE"
android:process="system">
</receiver>
- <service android:name="BluetoothPhoneService"
+ <service android:name=".components.BluetoothPhoneService"
android:singleUser="true"
android:process="system">
<intent-filter>
@@ -225,7 +225,7 @@
</intent-filter>
</service>
- <service android:name=".TelecomService"
+ <service android:name=".components.TelecomService"
android:singleUser="true"
android:process="system">
<intent-filter>