diff options
| author | Seven Shen <lingtongshen@gmail.com> | 2016-04-19 20:23:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-19 20:23:31 +0000 |
| commit | 9accc36b1a6a9779d31ea6edcc861a69167d37e5 (patch) | |
| tree | 7bc435c518d99edd42df2577958fad8e96f9ca67 /src/com/android/bluetooth | |
| parent | e8363190528d0d95a35ab265ab91c591eb17a7c3 (diff) | |
| parent | 64745b114948ea0c774f74af5721b6283087247d (diff) | |
| download | android_packages_apps_Bluetooth-9accc36b1a6a9779d31ea6edcc861a69167d37e5.tar.gz android_packages_apps_Bluetooth-9accc36b1a6a9779d31ea6edcc861a69167d37e5.tar.bz2 android_packages_apps_Bluetooth-9accc36b1a6a9779d31ea6edcc861a69167d37e5.zip | |
"DO NOT MERGE" Add write SMS protection
am: 64745b1
* commit '64745b114948ea0c774f74af5721b6283087247d':
"DO NOT MERGE" Add write SMS protection
Change-Id: Idb905753e4e4d711b11b7d5274e622df4e9c4251
Diffstat (limited to 'src/com/android/bluetooth')
| -rwxr-xr-x | src/com/android/bluetooth/map/BluetoothMapService.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/map/BluetoothMapService.java b/src/com/android/bluetooth/map/BluetoothMapService.java index 04d704355..f696bfaab 100755 --- a/src/com/android/bluetooth/map/BluetoothMapService.java +++ b/src/com/android/bluetooth/map/BluetoothMapService.java @@ -29,6 +29,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.IntentFilter.MalformedMimeTypeException; +import android.Manifest; import android.os.Handler; import android.os.Message; import android.os.ParcelUuid; @@ -560,7 +561,10 @@ public class BluetoothMapService extends ProfileService { try { registerReceiver(mMapReceiver, filter); - registerReceiver(mMapReceiver, filterMessageSent); + // We need WRITE_SMS permission to handle messages in + // actionMessageSentDisconnected() + registerReceiver(mMapReceiver, filterMessageSent, + Manifest.permission.WRITE_SMS, null); } catch (Exception e) { Log.w(TAG,"Unable to register map receiver",e); } @@ -1012,8 +1016,12 @@ public class BluetoothMapService extends ProfileService { { /* We do not have a connection to a device, hence we need to move the SMS to the correct folder. */ - BluetoothMapContentObserver + try { + BluetoothMapContentObserver .actionMessageSentDisconnected(context, intent, result); + } catch(IllegalArgumentException e) { + return; + } } } else if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED) && mIsWaitingAuthorization) { |