summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorElliot Sisteron <elliotsisteron@google.com>2023-06-22 14:25:43 +0000
committerElliot Sisteron <elliotsisteron@google.com>2023-06-22 14:28:03 +0000
commitcead7d3195b56318b26ea6a58d0ab16f9a92ba26 (patch)
tree096d75c095711b01cc84b8ed98574d1a8df8fc51 /service
parentf1309fecc4b58ad8ff3f06e22e241c6e104738c2 (diff)
downloadPermission-cead7d3195b56318b26ea6a58d0ab16f9a92ba26.tar.gz
Don't run receivers code if SC is disabled.
Bug: 287971377 Test: manual Relnote: N/A Change-Id: Ic3bd12a09aba846f7b937e8c0cdf2285166b69ef
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/safetycenter/SafetyCenterService.java20
1 files changed, 18 insertions, 2 deletions
diff --git a/service/java/com/android/safetycenter/SafetyCenterService.java b/service/java/com/android/safetycenter/SafetyCenterService.java
index 5d3847683..2d714127e 100644
--- a/service/java/com/android/safetycenter/SafetyCenterService.java
+++ b/service/java/com/android/safetycenter/SafetyCenterService.java
@@ -1012,7 +1012,7 @@ public final class SafetyCenterService extends SystemService {
/** {@link BroadcastReceiver} which handles Locale changes. */
private final class LocaleBroadcastReceiver extends BroadcastReceiver {
- private static final String TAG = "LocaleBroadcastReceiver";
+ private static final String TAG = "SafetyCenterLocaleBroad";
void register(Context context) {
IntentFilter filter = new IntentFilter();
@@ -1026,6 +1026,17 @@ public final class SafetyCenterService extends SystemService {
@Override
public void onReceive(Context context, Intent intent) {
+ if (!SafetyCenterFlags.getSafetyCenterEnabled()) {
+ Log.i(TAG, "Safety Center is disabled, ignoring intent: " + intent);
+ return;
+ }
+
+ String action = intent.getAction();
+ if (!TextUtils.equals(action, Intent.ACTION_LOCALE_CHANGED)) {
+ Log.w(TAG, "Received unexpected action: " + action);
+ return;
+ }
+
Log.d(TAG, "Locale changed broadcast received");
synchronized (mApiLock) {
mNotificationChannels.createAllChannelsForAllUsers(getContext());
@@ -1039,7 +1050,7 @@ public final class SafetyCenterService extends SystemService {
*/
private final class UserBroadcastReceiver extends BroadcastReceiver {
- private static final String TAG = "UserBroadcastReceiver";
+ private static final String TAG = "SafetyCenterUserBroadca";
void register(Context context) {
IntentFilter filter = new IntentFilter();
@@ -1058,6 +1069,11 @@ public final class SafetyCenterService extends SystemService {
@Override
public void onReceive(Context context, Intent intent) {
+ if (!SafetyCenterFlags.getSafetyCenterEnabled()) {
+ Log.i(TAG, "Safety Center is disabled, ignoring intent: " + intent);
+ return;
+ }
+
String action = intent.getAction();
if (action == null) {
Log.w(TAG, "Received broadcast with null action");