commit afce7ad2c2c347bb30119e224cd414a9a6339060
author Russell Brenner <russellbrenner@google.com> Fri Sep 13 15:29:21 2013 -0700
committer Russell Brenner <russellbrenner@google.com> Fri Sep 13 15:29:21 2013 -0700
tree 64bb27df71a9f0efd9dcd5f7f3ead903ba41d63c
parent 8d1de3499e10b571b64ba76a1e05086a93131400

Fix NPE when no pending intent was given

Setup wizard may not have sent a pending intent for activation
results, in which case we should not attempt to return them.

Bug: 10655576
Change-Id: I6cb89915d0319e75be984b2ce5808f8030e0c0a7

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();