From c857f90590e7d7fcffa89511982eb33afd34805f Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Mon, 15 May 2017 14:05:33 -0700
Subject: Update Dialer to v10 RC32

This release was created following the instructions at:
go/dialer-aosp-release

Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.

Version: 10
Candidate: RC32
Branch: dialer-android_release_branch/153304843.1
dialer-android_20170416.00/dialer-android_20170416.00_RC32

This release contains the following bug fixes since RC17:
Bug: 33176679 33272455 3646510 36773894 37297649 37413780
37513689 37640315 37680595 37698062 37873639 37901752
37919295 37953423 38062852 38069600 38137349 38173549
38180252 38191514

Test: make, on device
Change-Id: I4e4bb630082758e418ff24892b7db3142c6eb09a
---
 java/com/android/voicemail/impl/OmtpService.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'java/com/android/voicemail/impl/OmtpService.java')

diff --git a/java/com/android/voicemail/impl/OmtpService.java b/java/com/android/voicemail/impl/OmtpService.java
index ad24e1243..759be4fd1 100644
--- a/java/com/android/voicemail/impl/OmtpService.java
+++ b/java/com/android/voicemail/impl/OmtpService.java
@@ -27,6 +27,7 @@ import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.voicemail.VoicemailComponent;
 import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
+import com.android.voicemail.impl.sms.LegacyModeSmsHandler;
 import com.android.voicemail.impl.sync.VvmAccountManager;
 
 /** Implements {@link VisualVoicemailService} to receive visual voicemail events */
@@ -74,6 +75,11 @@ public class OmtpService extends VisualVoicemailService {
       return;
     }
 
+    if (!isUserUnlocked()) {
+      LegacyModeSmsHandler.handle(this, sms);
+      return;
+    }
+
     VvmPackageInstallHandler.scanNewPackages(this);
 
     if (!isServiceEnabled(sms.getPhoneAccountHandle())) {
-- 
cgit v1.2.3