commit 2d0a9617144002f41439978339bc96e9afb1a747
author Evan Wu <evanwu@google.com> Thu Aug 15 07:52:01 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 15 07:52:01 2019 -0700
tree 03c052025f8a935a430f4df9b364856b8bd3aac2
parent 3b7193f191ce7ddc2b00e44a3d73d74c6cc6f613
parent 780df8423a986ddb86a12dee6ff30021887bf5ad

Check for a null intent in RemoteVvmTaskManager#onStartCommand. am: c05ba58f5f
am: 780df8423a

Change-Id: I988ed6dea1829166555bd383b5e78ff298bdf9ad

src/com/android/phone/vvm/RemoteVvmTaskManager.java

diff --git a/src/com/android/phone/vvm/RemoteVvmTaskManager.java b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
index 50ac669..14030a1 100644
--- a/src/com/android/phone/vvm/RemoteVvmTaskManager.java
+++ b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
@@ -226,6 +226,11 @@
         Assert.isMainThread();
         mTaskReferenceCount++;
 
+        if (intent == null) {
+            VvmLog.i(TAG, "received intent is null");
+            checkReference();
+            return START_NOT_STICKY;
+        }
         PhoneAccountHandle phoneAccountHandle = intent.getExtras()
                 .getParcelable(VisualVoicemailService.DATA_PHONE_ACCOUNT_HANDLE);
         int subId = PhoneAccountHandleConverter.toSubId(phoneAccountHandle);