commit 84c630337d010fe9da57c36e9200a2c4c394aa85
author Chienyuan <chienyuanhuang@google.com> Thu Jul 23 15:16:35 2020 +0800
committer Anis Assi <anisassi@google.com> Thu Aug 20 13:58:17 2020 -0700
tree 56998454d8cd2f22ad7d7417a5ab565f0b2a1346
parent 00febcc68cb6f4d40fc38dbee14c9bb9ae21c7ab

SAP: Ensure pending intent is immutable

Bug: 156021269
TAG: #security
Test: manual
Change-Id: Ieea6a708ca0fd1689e4b120db12f0cd96e8db95d
Merged-In: Ieea6a708ca0fd1689e4b120db12f0cd96e8db95d
(cherry picked from commit c9395f31667bceb23d267e63506a652668367dab)

src/com/android/bluetooth/sap/SapServer.java

diff --git a/src/com/android/bluetooth/sap/SapServer.java b/src/com/android/bluetooth/sap/SapServer.java
index 8f8da2d..ef82535 100644
--- a/src/com/android/bluetooth/sap/SapServer.java
+++ b/src/com/android/bluetooth/sap/SapServer.java
@@ -217,6 +217,7 @@
                 mContext.getString(R.string.bluetooth_sap_notif_title),
                 NotificationManager.IMPORTANCE_HIGH);
         notificationManager.createNotificationChannel(notificationChannel);
+        flags |= PendingIntent.FLAG_IMMUTABLE;
         if(VERBOSE) Log.i(TAG, "setNotification type: " + type);
         /* For PTS TC_SERVER_DCN_BV_03_I we need to expose the option to send immediate disconnect
          * without first sending a graceful disconnect.