diff options
| author | Craig Mautner <cmautner@google.com> | 2012-09-28 15:54:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-28 15:54:44 -0700 |
| commit | 106a69271dd303baae1c428e269e1ec62994ff57 (patch) | |
| tree | 87ef57110b020dec2f9a31ca965066386d22e1c8 /policy | |
| parent | 3ff8e1a80058e5557d13693d3223e1aa011c0038 (diff) | |
| parent | 00baebe124701903db8eb35abb087767c5d769a5 (diff) | |
| download | frameworks_base-106a69271dd303baae1c428e269e1ec62994ff57.zip frameworks_base-106a69271dd303baae1c428e269e1ec62994ff57.tar.gz frameworks_base-106a69271dd303baae1c428e269e1ec62994ff57.tar.bz2 | |
Merge "Keep callback reference from being null." into jb-mr1-dev
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java index ebdb116..1abcc10 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java @@ -164,8 +164,9 @@ public class KeyguardViewManager { } private void inflateKeyguardView() { - if (mKeyguardView != null) { - mKeyguardHost.removeView(mKeyguardView); + View v = mKeyguardHost.findViewById(R.id.keyguard_host_view); + if (v != null) { + mKeyguardHost.removeView(v); } // TODO: Remove once b/7094175 is fixed Slog.d(TAG, "inflateKeyguardView: b/7094175 mContext.config=" |