Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d39ccaa2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SAP: fix the crash due to PendingIntent flag setting"

parents 070db5be bed1fc35

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -196,10 +196,7 @@ public class SapServer extends Thread implements Callback { 
            /* Handle local disconnect procedures */

            /* Handle local disconnect procedures */

            if (discType == SapMessage.DISC_GRACEFULL) {

            if (discType == SapMessage.DISC_GRACEFULL) {

                /* Update the notification to allow the user to initiate a force disconnect */

                /* Update the notification to allow the user to initiate a force disconnect */

                // TODO(b/171825892) Please replace FLAG_MUTABLE_UNAUDITED below

                setNotification(SapMessage.DISC_IMMEDIATE, PendingIntent.FLAG_CANCEL_CURRENT);

                // with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.

                setNotification(SapMessage.DISC_IMMEDIATE,

                        PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);





            } else if (discType == SapMessage.DISC_IMMEDIATE) {

            } else if (discType == SapMessage.DISC_IMMEDIATE) {

                /* Request an immediate disconnect, but start a timer to force disconnect if the

                /* Request an immediate disconnect, but start a timer to force disconnect if the