commit bbf60925044c9ea7613c4264dea20c6c12246118
author Jakub Pawlowski <jpawlowski@google.com> Mon May 10 15:36:32 2021 +0200
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 14 21:56:32 2021 +0000
tree 62355a81f730a3fb82661d02616f0a7c0ccb83cc
parent dc057fcf3789c181bf553302f592bfcd4bb2430c

Protect MAP Client message broadcasts with RECEIVE_SMS permission

Test: compilation
Bug: 177238342
Merged-In: Ie9984a95aa204710519da049819464875084900b
Change-Id: I80fa47b81e99cc43b432d01c88ff42e06d7647e1
(cherry picked from commit 1053a248da167ab586e282fb8057fef2ef87b659)

src/com/android/bluetooth/mapclient/MceStateMachine.java

diff --git a/src/com/android/bluetooth/mapclient/MceStateMachine.java b/src/com/android/bluetooth/mapclient/MceStateMachine.java
index ae11d2a..7bc70eb 100644
--- a/src/com/android/bluetooth/mapclient/MceStateMachine.java
+++ b/src/com/android/bluetooth/mapclient/MceStateMachine.java
@@ -51,6 +51,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Message;
+import android.provider.Telephony;
 import android.telecom.PhoneAccount;
 import android.telephony.SmsManager;
 import android.util.Log;
@@ -592,7 +593,12 @@
                         intent.putExtra(BluetoothMapClient.EXTRA_SENDER_CONTACT_NAME,
                                 originator.getDisplayName());
                     }
-                    mService.sendBroadcast(intent);
+                    // Only send to the current default SMS app if one exists
+                    String defaultMessagingPackage = Telephony.Sms.getDefaultSmsPackage(mService);
+                    if (defaultMessagingPackage != null) {
+                        intent.setPackage(defaultMessagingPackage);
+                    }
+                    mService.sendBroadcast(intent, android.Manifest.permission.RECEIVE_SMS);
                     break;
 
                 case MMS: