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

Merge "Keep callback reference from being null." into jb-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-09-28 15:54:43 -07:00
committed by Android (Google) Code Review
parent 3ff8e1a800 00baebe124
commit 106a69271d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
View File

@@ -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="