diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-23 10:37:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-23 10:37:18 +0000 |
| commit | 54c21601d950346278018738de6ed03e3d933921 (patch) | |
| tree | e7a090925332a963adc41eb97d0adac6de39b36c /java/com/android/voicemail/impl/protocol/Vvm3Protocol.java | |
| parent | ca2ef804166230c9370e402b1d9295f2889288eb (diff) | |
| parent | 80f3d35f64a720a1d59552589cb77e2061eadf6d (diff) | |
Merge "Prevent VVM subscribing when carrier reset subscription status"
Diffstat (limited to 'java/com/android/voicemail/impl/protocol/Vvm3Protocol.java')
| -rw-r--r-- | java/com/android/voicemail/impl/protocol/Vvm3Protocol.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/java/com/android/voicemail/impl/protocol/Vvm3Protocol.java b/java/com/android/voicemail/impl/protocol/Vvm3Protocol.java index 782386db1..5e7b592fa 100644 --- a/java/com/android/voicemail/impl/protocol/Vvm3Protocol.java +++ b/java/com/android/voicemail/impl/protocol/Vvm3Protocol.java @@ -115,8 +115,17 @@ public class Vvm3Protocol extends VisualVoicemailProtocol { OmtpVvmCarrierConfigHelper config, VoicemailStatus.Editor status, StatusMessage message, - Bundle data) { + Bundle data, + boolean isCarrierInitiated) { VvmLog.i(TAG, "start vvm3 provisioning"); + + if (isCarrierInitiated) { + // Carrier can send the "Status UNKNOWN, Can subscribe" status when upgrading to premium VVM. + // Ignore so we won't downgrade it back to basic. + VvmLog.w(TAG, "carrier initiated, ignoring"); + return; + } + LoggerUtils.logImpressionOnMainThread( config.getContext(), DialerImpression.Type.VVM_PROVISIONING_STARTED); if (OmtpConstants.SUBSCRIBER_UNKNOWN.equals(message.getProvisioningStatus())) { |