diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-28 02:35:07 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-28 02:35:07 +0000 |
commit | 281998c825ad48d842bb653e2f462719fdb0c1d9 (patch) | |
tree | bc8bfcce809257b3ddbb423a9808082292b9f6a3 /java/com/android/voicemail/impl/ActivationTask.java | |
parent | fc81a030a7b4f6d4a497f71aed593d398795e7da (diff) | |
parent | 183cb71663320f16149d83eeebaff7795a4b55f2 (diff) |
Merge "Remove field prefixes."
Diffstat (limited to 'java/com/android/voicemail/impl/ActivationTask.java')
-rw-r--r-- | java/com/android/voicemail/impl/ActivationTask.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/java/com/android/voicemail/impl/ActivationTask.java b/java/com/android/voicemail/impl/ActivationTask.java index 83f2fd836..3cdbee484 100644 --- a/java/com/android/voicemail/impl/ActivationTask.java +++ b/java/com/android/voicemail/impl/ActivationTask.java @@ -63,16 +63,16 @@ public class ActivationTask extends BaseTask { @VisibleForTesting static final String EXTRA_MESSAGE_DATA_BUNDLE = "extra_message_data_bundle"; - private final RetryPolicy mRetryPolicy; + private final RetryPolicy retryPolicy; @Nullable private OmtpVvmCarrierConfigHelper configForTest; - private Bundle mMessageData; + private Bundle messageData; public ActivationTask() { super(TASK_ACTIVATION); - mRetryPolicy = new RetryPolicy(RETRY_TIMES, RETRY_INTERVAL_MILLIS); - addPolicy(mRetryPolicy); + retryPolicy = new RetryPolicy(RETRY_TIMES, RETRY_INTERVAL_MILLIS); + addPolicy(retryPolicy); } /** Has the user gone through the setup wizard yet. */ @@ -108,7 +108,7 @@ public class ActivationTask extends BaseTask { @Override public void onCreate(Context context, Bundle extras) { super.onCreate(context, extras); - mMessageData = extras.getParcelable(EXTRA_MESSAGE_DATA_BUNDLE); + messageData = extras.getParcelable(EXTRA_MESSAGE_DATA_BUNDLE); } @Override @@ -168,7 +168,7 @@ public class ActivationTask extends BaseTask { } VvmLog.i(TAG, "VVM content provider configured - " + helper.getVvmType()); - if (mMessageData == null + if (messageData == null && VvmAccountManager.isAccountActivated(getContext(), phoneAccountHandle)) { VvmLog.i(TAG, "Account is already activated"); // The activated state might come from restored data, the filter still needs to be set up. @@ -191,15 +191,15 @@ public class ActivationTask extends BaseTask { } helper.activateSmsFilter(); - VoicemailStatus.Editor status = mRetryPolicy.getVoicemailStatusEditor(); + VoicemailStatus.Editor status = retryPolicy.getVoicemailStatusEditor(); VisualVoicemailProtocol protocol = helper.getProtocol(); Bundle data; - if (mMessageData != null) { + if (messageData != null) { // The content of STATUS SMS is provided to launch this task, no need to request it // again. - data = mMessageData; + data = messageData; } else { try (StatusSmsFetcher fetcher = new StatusSmsFetcher(getContext(), phoneAccountHandle)) { protocol.startActivation(helper, fetcher.getSentIntent()); |