Run Bluetooth Opp activities in the phone process.
There were just too much shared code between the classes - we
cannot have them in 2 different process - it can work sometimes and
will fail sometimes depending on the ordering of processes.
Rework involves a lot of code change at this point of time.
Bug: 2684281
Change-Id: I76784650c5f635c1e961392b682c1d33fc2f343f
diff --git a/AndroidManifest_test.xml b/AndroidManifest_test.xml
index de55b5f..0115724 100644
--- a/AndroidManifest_test.xml
+++ b/AndroidManifest_test.xml
@@ -45,6 +45,7 @@
</intent-filter>
</receiver>
<activity android:name=".opp.BluetoothOppLauncherActivity"
+ android:process="@string/process"
android:theme="@android:style/Theme.Dialog" android:label="@string/bt_share_picker_label">
<intent-filter>
<action android:name="android.intent.action.SEND" />
@@ -66,17 +67,23 @@
<data android:mimeType="vnd.android.cursor.item/vnd.android.btopp" />
</intent-filter>
</activity>
- <activity android:name=".opp.BluetoothOppBtEnableActivity">
+ <activity android:name=".opp.BluetoothOppBtEnableActivity"
+ android:process="@string/process">
</activity>
- <activity android:name=".opp.BluetoothOppBtErrorActivity">
+ <activity android:name=".opp.BluetoothOppBtErrorActivity"
+ android:process="@string/process">
</activity>
- <activity android:name=".opp.BluetoothOppBtEnablingActivity">
+ <activity android:name=".opp.BluetoothOppBtEnablingActivity"
+ android:process="@string/process">
android:theme="@android:style/Theme.Dialog"> </activity>
- <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity">
+ <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity"
+ android:process="@string/process">
</activity>
- <activity android:name=".opp.BluetoothOppTransferActivity">
+ <activity android:name=".opp.BluetoothOppTransferActivity"
+ android:process="@string/process">
</activity>
<activity android:name=".opp.BluetoothOppLiveFolder"
+ android:process="@string/process"
android:label="@string/btopp_live_folder">
<intent-filter>
<action android:name="android.intent.action.CREATE_LIVE_FOLDER" />