commit b41b50c3dc5bcb2d0d56a2bc1a196df1d67e9afe
author ykhung <ykhung@google.com> Sun Dec 18 16:21:08 2022 +0800
committer ykhung <ykhung@google.com> Mon Dec 19 00:07:27 2022 +0800
tree 5975cff9026b60a744acae7cd59b2edc3506672c
parent 6d57edf9acb24ae3a826da190d134cdba52e7df9

Add RECEIVER_EXPORTED for internal intent based on the PSA

Test: presubmit
Change-Id: I699f1e93cf8c44b046f131014d6200346798336e

src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java

diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
index 665be1f..5e432cf 100644
--- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
@@ -100,7 +100,8 @@
         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 @@
             }
         }
     }
-}
\ No newline at end of file
+}

tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index 79bd84b..4bfb15b 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 @@
 
     @Test
     public void testRegister_updateBatteryStatus() {
-        doReturn(mChargingIntent).when(mContext).registerReceiver(any(), any());
+        doReturn(mChargingIntent).when(mContext).registerReceiver(any(), any(), anyInt());
 
         mBatteryBroadcastReceiver.register();
         mBatteryBroadcastReceiver.register();