commit c36793943d79510b2e45b7bb93bf0dbad3ccc001
author Chienyuan <chienyuanhuang@google.com> Thu Jul 23 15:16:35 2020 +0800
committer Anis Assi <anisassi@google.com> Tue Sep 01 23:50:54 2020 -0700
tree 9dd52d7da21e9497ede0f5b60d397080046e518d
parent 91543252079be0127ebc89669bcd9fde8910ac5e

SAP: Ensure pending intent is immutable

Bug: 156021269
TAG: #security
Test: manual
Change-Id: Ieea6a708ca0fd1689e4b120db12f0cd96e8db95d
(cherry picked from commit 7b17763dad16814cb743c710efd64cc5fccd2239)

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 3ff1fc7..6885422 100644
--- a/src/com/android/bluetooth/sap/SapServer.java
+++ b/src/com/android/bluetooth/sap/SapServer.java
@@ -226,6 +226,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);
         }