From 467ae5ffc2b1819b28e956b57debb4d704397a87 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Fri, 20 Nov 2020 07:43:44 +0000 Subject: [PATCH] Revert "Revert "Specify explicitly FLAG_IMMUTABLE for PendingIntent"" This reverts commit 13ebec46a5aa18e4396222c34a332af6e58b8be6. Reason for revert: To fix the NPE issue Specify explicitly FLAG_MUTABLE for PendingIntent This change is to specify explicitly FLAG_MUTABLE to the pendingIntent since this intent is working with inline reply. Bug: 172894032 Test: manual test Change-Id: I5fdcf175307cec5e0e96b33d711221be839e1357 --- .../android/settings/fuelgauge/batterytip/BatteryTipUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java index ed06cce59d1..cdefe4d002d 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java @@ -124,7 +124,7 @@ public class BatteryTipUtils { throws StatsManager.StatsUnavailableException { final Intent extraIntent = new Intent(context, AnomalyDetectionReceiver.class); final PendingIntent pendingIntent = PendingIntent.getBroadcast(context, REQUEST_CODE, - extraIntent, PendingIntent.FLAG_UPDATE_CURRENT); + extraIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE); statsManager.setBroadcastSubscriber(pendingIntent, StatsManagerConfig.ANOMALY_CONFIG_KEY, StatsManagerConfig.SUBSCRIBER_ID); }