commit 9c345022d1e4215c3a33942deb34305df24966d7
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 07 20:50:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 07 20:50:26 2018 +0000
tree 8c21a8e4cda750fb96b7151cd04da9e0b9f94d0d
parent 2dacab9844d62cb8ecc0a32c6531844defaef888
parent 0e875d36c73dc4d68f758d38f41f9d2426c9da9c

Merge "Ignore events when there is no focused stack." into pi-dev

services/core/java/com/android/server/display/BrightnessTracker.java

diff --git a/services/core/java/com/android/server/display/BrightnessTracker.java b/services/core/java/com/android/server/display/BrightnessTracker.java
index df60c66..cabccf3 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 @@
 
         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;