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

Commit 6b66f3cf authored by Yi-Ling Chuang's avatar Yi-Ling Chuang Committed by android-build-team Robot
Browse files

Fix non responding slice toggling problem. 

The issue happens when users are toggling slices. Sometimes the toggle
doesn't work as expected because the pending intent of the toggle action
seems to be canceled for some reasons.

Hence, we replace FLAG_CANCEL_CURRENT with FLAG_UPDATE_CURRENT to prevent from
getting PendingIntent.CancelExcpetion from SliceActionView when toggling
slices.

Note that this change would only apply on Wifi, MobileData, Flashlight
and Bluetooth Slices.

Bug: 140719905
Test: rebuild and switch toggles
Change-Id: Iddbb16ddcbcf97b6f6e680b43645c04fbc061f39
(cherry picked from commit f8eb3080)
parent 9f75893c

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

+1 −1
Original line number Diff line number Diff line
@@ -136,6 +136,6 @@ public class BluetoothSliceBuilder { 
        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

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public interface CustomSliceable extends Sliceable { 
                .setData(getUri())

                .setClass(context, SliceBroadcastReceiver.class);

        return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,

                PendingIntent.FLAG_CANCEL_CURRENT);

                PendingIntent.FLAG_UPDATE_CURRENT);

    }



    @Override