diff options
| author | fredc <fredc@broadcom.com> | 2012-04-12 00:18:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-16 21:59:14 -0700 |
| commit | 6654f5c903de510a70f9e72cd5ad7837b615d93f (patch) | |
| tree | 293e5e07f1b092f37acd4ecada866cd91016f0ff /AndroidManifest.xml | |
| parent | 990b2cd65392bc6db58eda732ad41de22b713202 (diff) | |
| download | android_packages_apps_Bluetooth-6654f5c903de510a70f9e72cd5ad7837b615d93f.tar.gz android_packages_apps_Bluetooth-6654f5c903de510a70f9e72cd5ad7837b615d93f.tar.bz2 android_packages_apps_Bluetooth-6654f5c903de510a70f9e72cd5ad7837b615d93f.zip | |
Non persistent adapter service
Change-Id: I65e1c18e2899cea0a1e5c0102c4d24d39dce0249
Conflicts:
jni/com_android_bluetooth_hdp.cpp
jni/com_android_bluetooth_hid.cpp
Conflicts:
jni/com_android_bluetooth_hid.cpp
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index df07838df..a104eebbd 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -39,10 +39,13 @@ <uses-permission android:name="android.permission.NET_ADMIN" /> <uses-permission android:name="android.permission.CALL_PRIVILEGED" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> + <uses-permission android:name="android.permission.NET_TUNNELING" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <application - android:name=".btservice.AdapterService" + android:name=".btservice.AdapterApp" android:icon="@drawable/bt_share" - android:persistent="true" + android:persistent="false" android:label="@string/app_name"> <uses-library android:name="javax.obex" /> <provider android:name=".opp.BluetoothOppProvider" @@ -54,6 +57,13 @@ </provider> <service android:process="@string/process" + android:name = ".btservice.AdapterService"> + <intent-filter> + <action android:name="android.bluetooth.IBluetooth" /> + </intent-filter> + </service> + <service + android:process="@string/process" android:name=".opp.BluetoothOppService" android:permission="android.permission.ACCESS_BLUETOOTH_SHARE" /> <receiver @@ -210,5 +220,12 @@ <action android:name="android.bluetooth.IBluetoothHealth" /> </intent-filter> </service> + <service + android:process="@string/process" + android:name = ".pan.PanService"> + <intent-filter> + <action android:name="android.bluetooth.IBluetoothPan" /> + </intent-filter> + </service> </application> </manifest> |