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

Craig Mautner · Android (Google) Code Review · commit 106a69271dd3 · 2012-09-28T15:54:44.000-07:00
diff --git 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 @@ private void maybeCreateKeyguardLocked(boolean enableScreenRotation) {
     }
 
     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="

Original file line number	Diff line number	Diff line change
`@@ -164,8 +164,9 @@ private void maybeCreateKeyguardLocked(boolean enableScreenRotation) {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`private void inflateKeyguardView() {`
`167`		`- if (mKeyguardView != null) {`
`168`		`- mKeyguardHost.removeView(mKeyguardView);`
	`167`	`+ View v = mKeyguardHost.findViewById(R.id.keyguard_host_view);`
	`168`	`+ if (v != null) {`
	`169`	`+ mKeyguardHost.removeView(v);`
`169`	`170`	`}`
`170`	`171`	`// TODO: Remove once b/7094175 is fixed`
`171`	`172`	`Slog.d(TAG, "inflateKeyguardView: b/7094175 mContext.config="`