diff options
| author | 2018-02-26 14:11:40 +0000 | |
|---|---|---|
| committer | 2018-03-07 16:13:57 +0000 | |
| commit | 0e875d36c73dc4d68f758d38f41f9d2426c9da9c (patch) | |
| tree | 4d55ad04a20edc0c4d45e0920c52943297e2bac8 | |
| parent | 6e0e705844a6403aac78aba3341be22797172803 (diff) | |
Ignore events when there is no focused stack.
Skip brightness slider events when there is no
focused activity stack.
Bug: 73825714
Test: atest SystemUIGoogleTests
Test: atest BrightnessTrackerTest
Change-Id: I87376bbab47545dbcd9be684d1c8174fc9c8d92f
| -rw-r--r-- | services/core/java/com/android/server/display/BrightnessTracker.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/display/BrightnessTracker.java b/services/core/java/com/android/server/display/BrightnessTracker.java index df60c6654c4b..cabccf37ebaa 100644 --- a/services/core/java/com/android/server/display/BrightnessTracker.java +++ b/services/core/java/com/android/server/display/BrightnessTracker.java @@ -333,8 +333,16 @@ public class BrightnessTracker { try { final ActivityManager.StackInfo focusedStack = mInjector.getFocusedStack(); - builder.setUserId(focusedStack.userId); - builder.setPackageName(focusedStack.topActivity.getPackageName()); + if (focusedStack != null && focusedStack.topActivity != null) { + builder.setUserId(focusedStack.userId); + builder.setPackageName(focusedStack.topActivity.getPackageName()); + } else { + // Ignore the event because we can't determine user / package. + if (DEBUG) { + Slog.d(TAG, "Ignoring event due to null focusedStack."); + } + return; + } } catch (RemoteException e) { // Really shouldn't be possible. return; |