diff options
| author | Jim Miller <jaggies@google.com> | 2012-01-27 17:59:49 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-01-27 17:59:49 -0800 |
| commit | 118bb2bd86194454452655345846c85ec59ba547 (patch) | |
| tree | f7fcf8f8b41dfdce9e76ab08ff07a37283bd35bb /policy | |
| parent | b90559a6066965debe173e2ea94bbffb87ad2d6a (diff) | |
| download | frameworks_base-118bb2bd86194454452655345846c85ec59ba547.zip frameworks_base-118bb2bd86194454452655345846c85ec59ba547.tar.gz frameworks_base-118bb2bd86194454452655345846c85ec59ba547.tar.bz2 | |
Fix 5906830: Don't crash on lock screens that lack a clock.
This fixes a crash seen in SIM unlock screen where the
layout doesn't have a clock to update.
Change-Id: Ic1473b60f6d32f3feae9e7aa4510f6e435fa9a73
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java index e39c49f..9f3de69 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardStatusViewManager.java @@ -294,8 +294,10 @@ class KeyguardStatusViewManager implements OnClickListener { public void onResume() { if (DEBUG) Log.v(TAG, "onResume()"); - // First update the clock - mDigitalClock.updateTime(); + // First update the clock, if present. + if (mDigitalClock != null) { + mDigitalClock.updateTime(); + } mUpdateMonitor.registerInfoCallback(mInfoCallback); mUpdateMonitor.registerSimStateCallback(mSimStateCallback); |