commit 6702e4b5d52ec458a18ecc1382d020debedb2a8f
author Mindy Pereira <mindyp@google.com> Thu May 03 09:47:40 2012 -0700
committer Mindy Pereira <mindyp@google.com> Thu May 03 09:47:40 2012 -0700
tree c8da95e3eb2052c1187c13596472577e40696f86
parent 3f892cca0a6f647b879e1f4998207a1e7ef4bc5a

Do null checks.

Fixes monkey bugs:
fixes b/6436988 com.android.calculator2: java.lang.NullPointerExceptionat com.android.calculator2.Calculator.onOptionsItemSelected(Calculator.java:212)
fixes b/6438256 com.android.calculator2: java.lang.NullPointerExceptionat com.android.calculator2.Calculator.onOptionsItemSelected(Calculator.java:206)

Change-Id: I608c45a0d45d3b2d13fece35e3dc9c9bac4f9223

src/com/android/calculator2/Calculator.java

diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index 51aa38a..18b676c 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -202,13 +202,13 @@
                 break;
 
             case R.id.basic:
-                if (!getBasicVisibility()) {
+                if (!getBasicVisibility() && mPager != null) {
                     mPager.setCurrentItem(BASIC_PANEL);
                 }
                 break;
 
             case R.id.advanced:
-                if (!getAdvancedVisibility()) {
+                if (!getAdvancedVisibility() && mPager != null) {
                     mPager.setCurrentItem(ADVANCED_PANEL);
                 }
                 break;
@@ -234,7 +234,8 @@
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
-        if (keyCode == KeyEvent.KEYCODE_BACK && getAdvancedVisibility()) {
+        if (keyCode == KeyEvent.KEYCODE_BACK && getAdvancedVisibility()
+                && mPager != null) {
             mPager.setCurrentItem(BASIC_PANEL);
             return true;
         } else {