diff options
| author | Roman Birg <roman@cyngn.com> | 2016-05-03 14:36:31 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-03 16:32:23 -0700 |
| commit | d8a30fc958a9e5cf780c6dc437a4487e73eba956 (patch) | |
| tree | 588bde9d893f897d54be4be4e4d8f9d1a08fe01f /packages | |
| parent | 61ed45740cb3d53ded82bee7dff9a391a3888bf7 (diff) | |
| download | frameworks_base-d8a30fc958a9e5cf780c6dc437a4487e73eba956.zip frameworks_base-d8a30fc958a9e5cf780c6dc437a4487e73eba956.tar.gz frameworks_base-d8a30fc958a9e5cf780c6dc437a4487e73eba956.tar.bz2 | |
SystemUI: avoid lock screen shortcut picker crash
Fixes crash when picking lock screen shortcut app, then rotating, then
hitting the back button.
Ticket: FEIJ-299
Change-Id: I728052878ca3fc87243878ef96acea2e052aed6d
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsActivity.java b/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsActivity.java index 87d57c8..3cd86fe 100644 --- a/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsActivity.java @@ -235,8 +235,10 @@ public class LockscreenShortcutsActivity extends Activity implements View.OnClic private void onTargetChange(String uri) { if (uri == null) { - final GlowBackground background = (GlowBackground) mSelectedView.getBackground(); - background.hideGlow(); + if (mSelectedView != null) { + final GlowBackground background = (GlowBackground) mSelectedView.getBackground(); + background.hideGlow(); + } return; } |