Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9c345022d1

Change-Id: I281142563c53e0b40b2784272dffedfc65a0dfb0
This commit is contained in:
Kenny Guy
2018-03-07 21:07:04 +00:00
committed by android-build-merger
parent 168a77237f 9c345022d1
commit 7ebce228cf
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/display/BrightnessTracker.java
View File

@@ -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;