diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-08 13:04:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-08 13:04:34 +0000 |
| commit | 11b7a3813901e9894a37222848c56d8ae353d38d (patch) | |
| tree | 0f1d67eb68d9209b8ac46ff86599ef69c5e5077e /packages/SystemUI/src | |
| parent | 26ecbefea064af5ae616b135aa56fec1009296e7 (diff) | |
| parent | bccb9123a580a1fdf5b22226eaa2be3848ec2a9a (diff) | |
| download | frameworks_base-11b7a3813901e9894a37222848c56d8ae353d38d.zip frameworks_base-11b7a3813901e9894a37222848c56d8ae353d38d.tar.gz frameworks_base-11b7a3813901e9894a37222848c56d8ae353d38d.tar.bz2 | |
Merge "Fix crash in ActivatableNotificationView."
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java index c81a3c8..91df9ef 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java @@ -175,8 +175,10 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView private void makeInactive() { if (mActivated) { // Make sure that we clear the hotspot from the center. - mBackgroundDimmed.setHotspot(0, getWidth() / 2, getActualHeight() / 2); - mBackgroundDimmed.removeHotspot(0); + if (mBackgroundDimmed != null) { + mBackgroundDimmed.setHotspot(0, getWidth() / 2, getActualHeight() / 2); + mBackgroundDimmed.removeHotspot(0); + } mActivated = false; } if (mOnActivatedListener != null) { |