From b41b50c3dc5bcb2d0d56a2bc1a196df1d67e9afe Mon Sep 17 00:00:00 2001
From: ykhung <ykhung@google.com>
Date: Sun, 18 Dec 2022 16:21:08 +0800
Subject: [PATCH] Add RECEIVER_EXPORTED for internal intent based on the PSA

Test: presubmit
Change-Id: I699f1e93cf8c44b046f131014d6200346798336e
---
 .../android/settings/fuelgauge/BatteryBroadcastReceiver.java | 5 +++--
 .../settings/fuelgauge/BatteryBroadcastReceiverTest.java     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
index 665be1f0f2c..5e432cf5b4e 100644
--- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
@@ -100,7 +100,8 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver {
         intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
         intentFilter.addAction(BatteryUtils.BYPASS_DOCK_DEFENDER_ACTION);
 
-        final Intent intent = mContext.registerReceiver(this, intentFilter);
+        final Intent intent = mContext.registerReceiver(this, intentFilter,
+                Context.RECEIVER_EXPORTED);
         updateBatteryStatus(intent, true /* forceUpdate */);
     }
 
@@ -138,4 +139,4 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index 79bd84bd1ec..4bfb15baf4e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -142,7 +142,7 @@ public class BatteryBroadcastReceiverTest {
 
     @Test
     public void testRegister_updateBatteryStatus() {
-        doReturn(mChargingIntent).when(mContext).registerReceiver(any(), any());
+        doReturn(mChargingIntent).when(mContext).registerReceiver(any(), any(), anyInt());
 
         mBatteryBroadcastReceiver.register();
         mBatteryBroadcastReceiver.register();