commit 0495ec3b96031dcef4b4ff8591ed6ede264cb91a
author Yi-Ling Chuang <emilychuang@google.com> Wed Oct 16 21:32:12 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 16 21:32:12 2019 -0700
tree a6ce45b01446de15baff3dd38e9f2d90b25b2fbf
parent f28a690ad9fb59062463a680388ea01c1071f6e3
parent e87289bbc4f0b9ce92e0cc5b85cf11213cf27487

Merge "Fix non responding slice toggling problem." into qt-qpr1-dev am: 5956f903cb
am: e87289bbc4

Change-Id: I7cea63639e03070d6aee1eeaf82214bc5f4328b6

src/com/android/settings/bluetooth/BluetoothSliceBuilder.java

diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
index 18df872..5a4ee1f 100644
--- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
+++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -136,6 +136,6 @@
         final Intent intent = new Intent(ACTION_BLUETOOTH_SLICE_CHANGED)
                 .setClass(context, SliceBroadcastReceiver.class);
         return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
-                PendingIntent.FLAG_CANCEL_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT);
     }
 }

src/com/android/settings/slices/CustomSliceable.java

diff --git a/src/com/android/settings/slices/CustomSliceable.java b/src/com/android/settings/slices/CustomSliceable.java
index 9566be1..92c604e 100644
--- a/src/com/android/settings/slices/CustomSliceable.java
+++ b/src/com/android/settings/slices/CustomSliceable.java
@@ -95,7 +95,7 @@
                 .setData(getUri())
                 .setClass(context, SliceBroadcastReceiver.class);
         return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
-                PendingIntent.FLAG_CANCEL_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
     @Override