commit 5ad31aa4d2e56654e7fd663faedc254b7760b535
author Russell Brenner <russellbrenner@google.com> Fri Sep 13 17:15:25 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 13 17:15:25 2013 -0700
tree 739a24c3f5132bb3ed821d1be272452c951a9a5b
parent 23d0369b25c658dcb708f8fe98777c201c1bb453
parent afce7ad2c2c347bb30119e224cd414a9a6339060

am afce7ad2: Fix NPE when no pending intent was given

* commit 'afce7ad2c2c347bb30119e224cd414a9a6339060':
  Fix NPE when no pending intent was given

src/com/android/phone/HfaActivity.java

diff --git a/src/com/android/phone/HfaActivity.java b/src/com/android/phone/HfaActivity.java
index 3bc047d..c1753d0 100644
--- a/src/com/android/phone/HfaActivity.java
+++ b/src/com/android/phone/HfaActivity.java
@@ -225,14 +225,17 @@
         final PendingIntent otaResponseIntent = getIntent().getParcelableExtra(
                 OtaUtils.EXTRA_OTASP_RESULT_CODE_PENDING_INTENT);
 
-        final Intent extraStuff = new Intent();
-        extraStuff.putExtra(OtaUtils.EXTRA_OTASP_RESULT_CODE, responseCode);
+        if (otaResponseIntent != null) {
+            final Intent extraStuff = new Intent();
+            extraStuff.putExtra(OtaUtils.EXTRA_OTASP_RESULT_CODE, responseCode);
 
-        try {
-            if (VERBOSE) Log.v(TAG, "Sending OTASP confirmation with result code: " + responseCode);
-            otaResponseIntent.send(this, 0 /* resultCode (not used) */, extraStuff);
-        } catch (CanceledException e) {
-            Log.e(TAG, "Pending Intent canceled");
+            try {
+                if (VERBOSE) Log.v(TAG, "Sending OTASP confirmation with result code: "
+                        + responseCode);
+                otaResponseIntent.send(this, 0 /* resultCode (not used) */, extraStuff);
+            } catch (CanceledException e) {
+                Log.e(TAG, "Pending Intent canceled");
+            }
         }
 
         finish();