diff options
author | Seven Shen <lingtongshen@gmail.com> | 2016-05-03 14:57:48 -0700 |
---|---|---|
committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-06-07 14:42:37 -0700 |
commit | 6a046b44e2fe07d23df263c5dfa69968821978e5 (patch) | |
tree | 4a71bac978c2eb2eb12aa178868046f1f8a2791f | |
parent | e944d36c42e4f55694cbfc42fbc32edd5a4f52c7 (diff) | |
download | android_packages_apps_Bluetooth-6a046b44e2fe07d23df263c5dfa69968821978e5.tar.gz android_packages_apps_Bluetooth-6a046b44e2fe07d23df263c5dfa69968821978e5.tar.bz2 android_packages_apps_Bluetooth-6a046b44e2fe07d23df263c5dfa69968821978e5.zip |
[PATCH] "DO NOT MERGE" Add write SMS protection
Ticket: CYNGNOS-2707
Bug: 25138326
Change-Id: I9f418370b8725d49e3734406b6f435107bcff021
(cherry picked from commit 64745b114948ea0c774f74af5721b6283087247d)
-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 003687658..3a6690431 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.HandlerThread; import android.os.Looper; @@ -625,7 +626,10 @@ public class BluetoothMapService extends ProfileService { if (!mRegisteredMapReceiver) { 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); mRegisteredMapReceiver = true; } catch (Exception e) { Log.e(TAG,"Unable to register map receiver",e); @@ -1113,8 +1117,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) { |