commit 2f61a067e6865739bfe6c359a1506f6155e2ba87
author Evan Wu <evanwu@google.com> Thu Aug 15 07:41:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 15 07:41:00 2019 -0700
tree 03c052025f8a935a430f4df9b364856b8bd3aac2
parent f38581a337d63611c87f07b293ccf1c951222c41
parent c05ba58f5fcc4f51afea129cb56a853b0c63b668

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

Change-Id: Idf270f770eaa65e3e71f245f2ccadf6443c2ed6e

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