summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2017-09-20 06:22:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-20 06:22:22 +0000
commit9dfa6a3b2da765781a4873cd2afe2fa3266d7b86 (patch)
treeed94cac13e7f8973903581c38ceb70ffbfcdc1ab
parentb04b271c5aad2572c93064d904b829195180f7bd (diff)
parent851d79de4a52cd8fb90caafad6d4ed1d9ad07d00 (diff)
Merge "Show legacy voicemail notification under FBE"
am: 851d79de4a Change-Id: I9c00c25be0dcbcaa477dda61f585ad05d1af0979
-rw-r--r--java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
index 4e43704f1..74ddff245 100644
--- a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
+++ b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
@@ -25,6 +25,7 @@ import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.support.annotation.VisibleForTesting;
import android.support.v4.os.BuildCompat;
+import android.support.v4.os.UserManagerCompat;
import android.telecom.PhoneAccountHandle;
import android.telephony.TelephonyManager;
import com.android.dialer.app.calllog.LegacyVoicemailNotifier;
@@ -113,6 +114,7 @@ public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver {
}
if (!intent.getBooleanExtra(VoicemailClient.EXTRA_IS_LEGACY_MODE, false)
+ && UserManagerCompat.isUserUnlocked(context)
&& VoicemailComponent.get(context)
.getVoicemailClient()
.isActivated(context, phoneAccountHandle)) {