Cleanup Opp debug code
Stop Rfcomm polling
Delete a few unused functions
diff --git a/AndroidManifest_test.xml b/AndroidManifest_test.xml
index 5f8c559..66b14ed 100644
--- a/AndroidManifest_test.xml
+++ b/AndroidManifest_test.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.bluetooth.opp" >
+ package="com.android.bluetooth" >
<!-- Allows access to the Bluetooth Share Manager -->
<permission android:name="android.permission.ACCESS_BLUETOOTH_SHARE"
android:label="@string/permlab_bluetoothShareManager"
android:description="@string/permdesc_bluetoothShareManager"
- android:protectionLevel="signatureOrSystem" />
+ android:protectionLevel="signature" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACCESS_BLUETOOTH_SHARE" />
<uses-permission android:name="android.permission.INTERNET" />
@@ -13,37 +13,43 @@
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_CONTACTS" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <uses-permission android:name="android.permission.WRITE_SETTINGS" />
<application android:icon="@drawable/bt_share"
android:label="@string/app_name">
<uses-library android:name="javax.obex" />
- <activity android:name=".TestActivity" android:label="@string/app_name">
+ <activity android:name=".opp.TestActivity" android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <provider android:name=".BluetoothOppProvider"
- android:authorities="com.android.bluetooth.opp"
+ <provider android:name=".opp.BluetoothOppProvider"
+ android:authorities="com.android.bluetooth.opp">
+ <path-permission
+ android:path="/btopp"
+ android:permission="android.permission.ACCESS_BLUETOOTH_SHARE" />
+ </provider>
+ <service android:name=".opp.BluetoothOppService"
android:permission="android.permission.ACCESS_BLUETOOTH_SHARE" />
- <service android:name=".BluetoothOppService"
- android:permission="android.permission.ACCESS_BLUETOOTH_SHARE" />
- <receiver android:name=".BluetoothOppReceiver">
+ <receiver android:name=".opp.BluetoothOppReceiver">
<intent-filter>
<action android:name="android.bluetooth.intent.action.BLUETOOTH_STATE_CHANGED" />
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
- <activity android:name="BluetoothOppLauncherActivity"
+ <activity android:name=".opp.BluetoothOppLauncherActivity"
android:theme="@android:style/Theme.Dialog" android:label="@string/bt_share_picker_label">
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" />
<data android:mimeType="video/*" />
- <data android:mimeType="text/x-vcard" />
+ <data android:mimeType="audio/*" />
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.ACTION_SHARE_MULTIPLE" />
+ <action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" />
<data android:mimeType="video/*" />
@@ -55,31 +61,37 @@
<data android:mimeType="vnd.android.cursor.item/vnd.android.btopp" />
</intent-filter>
</activity>
- <activity android:name="BluetoothOppBtEnableActivity">
+ <activity android:name=".opp.BluetoothOppBtEnableActivity">
</activity>
- <activity android:name="BluetoothOppBtErrorActivity">
+ <activity android:name=".opp.BluetoothOppBtErrorActivity">
</activity>
- <activity android:name="BluetoothOppBtEnablingActivity">
+ <activity android:name=".opp.BluetoothOppBtEnablingActivity">
android:theme="@android:style/Theme.Dialog"> </activity>
- <activity android:name="BluetoothOppIncomingFileConfirmActivity">
+ <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity">
</activity>
- <activity android:name="BluetoothOppTransferActivity">
+ <activity android:name=".opp.BluetoothOppTransferActivity">
</activity>
- <activity android:name="BluetoothDevicePickerActivity">
- </activity>
- <activity android:name="BluetoothPinDialog" android:label="@string/bluetooth_pin_entry"
- android:theme="@*android:style/Theme.Dialog.Alert">
- <intent-filter>
- <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
- <activity android:name="BluetoothOppLiveFolder"
+ <activity android:name=".opp.BluetoothOppLiveFolder"
android:label="@string/btopp_live_folder">
<intent-filter>
<action android:name="android.intent.action.CREATE_LIVE_FOLDER" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
+ <activity android:name=".pbap.BluetoothPbapActivity"
+ android:label=" "
+ android:theme="@*android:style/Theme.Dialog.Alert">
+ <intent-filter>
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+ <service android:name=".pbap.BluetoothPbapService" >
+ <action android:name="android.bluetooth.IBluetoothPbap"/>
+ </service>
+ <receiver android:name=".pbap.BluetoothPbapReceiver">
+ <intent-filter>
+ <action android:name="android.bluetooth.intent.action.BLUETOOTH_STATE_CHANGED"/>
+ </intent-filter>
+ </receiver>
</application>
</manifest>