commit 1dfd01546403df1d1db4576ddef43be05e8283ae
author Yorke Lee <yorkelee@google.com> Mon Jun 10 10:21:57 2013 -0700
committer The Android Automerger <android-build@android.com> Mon Jun 10 15:20:03 2013 -0700
tree ceff2eb90090b28f0df9b0c4ca7c10d521adea22
parent 3a18654bf87df4f17880551b6cfa45c871917960

Fix crash in Dialer in landscape mode

Bug 9369806

Change-Id: I286ebb828c0f6ce7c005c541661b9aa67284847e

src/com/android/dialer/dialpad/DialpadFragment.java

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 3d75e39..5f70312 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -368,7 +368,8 @@
         mDialpadChooser = (ListView) fragmentView.findViewById(R.id.dialpadChooser);
         mDialpadChooser.setOnItemClickListener(this);
 
-        // Smart dial
+        // Smart dial container. This is null if in landscape mode since it is not present
+        // in the landscape dialer layout.
         mSmartDialContainer = (RelativeLayout) fragmentView.findViewById(
                 R.id.dialpad_smartdial_container);
 
@@ -556,7 +557,7 @@
 
         // retrieve dialpad autocomplete setting
         mSmartDialEnabled = Settings.Secure.getInt(contentResolver,
-                Settings.Secure.DIALPAD_AUTOCOMPLETE, 0) == 1;
+                Settings.Secure.DIALPAD_AUTOCOMPLETE, 0) == 1 && mSmartDialContainer != null;
 
         stopWatch.lap("dtwd");
 
@@ -1731,7 +1732,9 @@
                 mSmartDialCache.cacheIfNeeded(true);
             }
         } else {
-            mSmartDialContainer.setVisibility(View.GONE);
+            if (mSmartDialContainer != null) {
+                mSmartDialContainer.setVisibility(View.GONE);
+            }
             mSmartDialCache = null;
         }
     }