From 465f88722e8fdbdbed3727fe3ea14744303df95c Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Wed, 17 Nov 2021 18:00:22 +0000 Subject: [PATCH] Add required flag to VibratorManagerService context receiver This flag is required in Android T+. Using RECEIVER_NOT_EXPORTED as the intents broadcasted are from the system. Fix: 206808317 Test: manual Change-Id: I4cbe9ebb7d8a52b4904338e7c9b8a13d1bfa47a6 --- .../java/com/android/server/vibrator/VibrationSettings.java | 4 +++- .../com/android/server/vibrator/VibratorManagerService.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/vibrator/VibrationSettings.java b/services/core/java/com/android/server/vibrator/VibrationSettings.java index 95305ba6b3c3e..bc21f1bd2ed32 100644 --- a/services/core/java/com/android/server/vibrator/VibrationSettings.java +++ b/services/core/java/com/android/server/vibrator/VibrationSettings.java @@ -171,7 +171,9 @@ final class VibrationSettings { } }); - mContext.registerReceiver(mUserReceiver, new IntentFilter(Intent.ACTION_USER_SWITCHED)); + IntentFilter filter = new IntentFilter(Intent.ACTION_USER_SWITCHED); + mContext.registerReceiver(mUserReceiver, filter, Context.RECEIVER_NOT_EXPORTED); + registerSettingsObserver(Settings.System.getUriFor(Settings.System.VIBRATE_INPUT_DEVICES)); registerSettingsObserver(Settings.System.getUriFor(Settings.System.VIBRATE_WHEN_RINGING)); registerSettingsObserver(Settings.Global.getUriFor(Settings.Global.APPLY_RAMPING_RINGER)); diff --git a/services/core/java/com/android/server/vibrator/VibratorManagerService.java b/services/core/java/com/android/server/vibrator/VibratorManagerService.java index 3a3ce5b894a1a..0675ad6451ce6 100644 --- a/services/core/java/com/android/server/vibrator/VibratorManagerService.java +++ b/services/core/java/com/android/server/vibrator/VibratorManagerService.java @@ -229,7 +229,7 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_SCREEN_OFF); - context.registerReceiver(mIntentReceiver, filter); + context.registerReceiver(mIntentReceiver, filter, Context.RECEIVER_NOT_EXPORTED); injector.addService(EXTERNAL_VIBRATOR_SERVICE, new ExternalVibratorService()); }