diff options
Diffstat (limited to 'java/com/android/voicemail/impl/scheduling')
4 files changed, 89 insertions, 84 deletions
diff --git a/java/com/android/voicemail/impl/scheduling/BaseTask.java b/java/com/android/voicemail/impl/scheduling/BaseTask.java index 773d026bf..0b707583c 100644 --- a/java/com/android/voicemail/impl/scheduling/BaseTask.java +++ b/java/com/android/voicemail/impl/scheduling/BaseTask.java @@ -44,25 +44,25 @@ public abstract class BaseTask implements Task { private static final String EXTRA_EXECUTION_TIME = "extra_execution_time"; - private Bundle mExtras; + private Bundle extras; - private Context mContext; + private Context context; - private int mId; - private PhoneAccountHandle mPhoneAccountHandle; + private int id; + private PhoneAccountHandle phoneAccountHandle; - private boolean mHasStarted; - private volatile boolean mHasFailed; + private boolean hasStarted; + private volatile boolean hasFailed; - @NonNull private final List<Policy> mPolicies = new ArrayList<>(); + @NonNull private final List<Policy> policies = new ArrayList<>(); - private long mExecutionTime; + private long executionTime; - private static Clock sClock = new Clock(); + private static Clock clock = new Clock(); protected BaseTask(int id) { - mId = id; - mExecutionTime = getTimeMillis(); + this.id = id; + executionTime = getTimeMillis(); } /** @@ -72,27 +72,27 @@ public abstract class BaseTask implements Task { @MainThread public void setId(int id) { Assert.isMainThread(); - mId = id; + this.id = id; } @MainThread public boolean hasStarted() { Assert.isMainThread(); - return mHasStarted; + return hasStarted; } @MainThread public boolean hasFailed() { Assert.isMainThread(); - return mHasFailed; + return hasFailed; } public Context getContext() { - return mContext; + return context; } public PhoneAccountHandle getPhoneAccountHandle() { - return mPhoneAccountHandle; + return phoneAccountHandle; } /** * Should be call in the constructor or {@link Policy#onCreate(BaseTask, Bundle)} will be missed. @@ -100,7 +100,7 @@ public abstract class BaseTask implements Task { @MainThread public BaseTask addPolicy(Policy policy) { Assert.isMainThread(); - mPolicies.add(policy); + policies.add(policy); return this; } @@ -112,18 +112,18 @@ public abstract class BaseTask implements Task { @WorkerThread public void fail() { Assert.isNotMainThread(); - mHasFailed = true; + hasFailed = true; } /** @param timeMillis the time since epoch, in milliseconds. */ @MainThread public void setExecutionTime(long timeMillis) { Assert.isMainThread(); - mExecutionTime = timeMillis; + executionTime = timeMillis; } public long getTimeMillis() { - return sClock.getTimeMillis(); + return clock.getTimeMillis(); } /** @@ -131,7 +131,7 @@ public abstract class BaseTask implements Task { * their intent upon this. */ public Intent createRestartIntent() { - return createIntent(getContext(), this.getClass(), mPhoneAccountHandle); + return createIntent(getContext(), this.getClass(), phoneAccountHandle); } /** @@ -147,22 +147,22 @@ public abstract class BaseTask implements Task { @Override public TaskId getId() { - return new TaskId(mId, mPhoneAccountHandle); + return new TaskId(id, phoneAccountHandle); } @Override public Bundle toBundle() { - mExtras.putLong(EXTRA_EXECUTION_TIME, mExecutionTime); - return mExtras; + extras.putLong(EXTRA_EXECUTION_TIME, executionTime); + return extras; } @Override @CallSuper public void onCreate(Context context, Bundle extras) { - mContext = context; - mExtras = extras; - mPhoneAccountHandle = extras.getParcelable(EXTRA_PHONE_ACCOUNT_HANDLE); - for (Policy policy : mPolicies) { + this.context = context; + this.extras = extras; + phoneAccountHandle = extras.getParcelable(EXTRA_PHONE_ACCOUNT_HANDLE); + for (Policy policy : policies) { policy.onCreate(this, extras); } } @@ -170,42 +170,42 @@ public abstract class BaseTask implements Task { @Override @CallSuper public void onRestore(Bundle extras) { - if (mExtras.containsKey(EXTRA_EXECUTION_TIME)) { - mExecutionTime = extras.getLong(EXTRA_EXECUTION_TIME); + if (this.extras.containsKey(EXTRA_EXECUTION_TIME)) { + executionTime = extras.getLong(EXTRA_EXECUTION_TIME); } } @Override public long getReadyInMilliSeconds() { - return mExecutionTime - getTimeMillis(); + return executionTime - getTimeMillis(); } @Override @CallSuper public void onBeforeExecute() { - for (Policy policy : mPolicies) { + for (Policy policy : policies) { policy.onBeforeExecute(); } - mHasStarted = true; + hasStarted = true; } @Override @CallSuper public void onCompleted() { - if (mHasFailed) { - for (Policy policy : mPolicies) { + if (hasFailed) { + for (Policy policy : policies) { policy.onFail(); } } - for (Policy policy : mPolicies) { + for (Policy policy : policies) { policy.onCompleted(); } } @Override public void onDuplicatedTaskAdded(Task task) { - for (Policy policy : mPolicies) { + for (Policy policy : policies) { policy.onDuplicatedTaskAdded(); } } @@ -221,6 +221,6 @@ public abstract class BaseTask implements Task { /** Used to replace the clock with an deterministic clock */ @NeededForTesting static void setClockForTesting(Clock clock) { - sClock = clock; + BaseTask.clock = clock; } } diff --git a/java/com/android/voicemail/impl/scheduling/MinimalIntervalPolicy.java b/java/com/android/voicemail/impl/scheduling/MinimalIntervalPolicy.java index 342b56e8a..6d6a0a1af 100644 --- a/java/com/android/voicemail/impl/scheduling/MinimalIntervalPolicy.java +++ b/java/com/android/voicemail/impl/scheduling/MinimalIntervalPolicy.java @@ -27,18 +27,18 @@ import com.android.voicemail.impl.scheduling.Task.TaskId; */ public class MinimalIntervalPolicy implements Policy { - BaseTask mTask; - TaskId mId; - int mBlockForMillis; + BaseTask task; + TaskId id; + int blockForMillis; public MinimalIntervalPolicy(int blockForMillis) { - mBlockForMillis = blockForMillis; + this.blockForMillis = blockForMillis; } @Override public void onCreate(BaseTask task, Bundle extras) { - mTask = task; - mId = mTask.getId(); + this.task = task; + id = this.task.getId(); } @Override @@ -46,12 +46,12 @@ public class MinimalIntervalPolicy implements Policy { @Override public void onCompleted() { - if (!mTask.hasFailed()) { + if (!task.hasFailed()) { Intent intent = - BaseTask.createIntent(mTask.getContext(), BlockerTask.class, mId.phoneAccountHandle); - intent.putExtra(BlockerTask.EXTRA_TASK_ID, mId.id); - intent.putExtra(BlockerTask.EXTRA_BLOCK_FOR_MILLIS, mBlockForMillis); - mTask.getContext().sendBroadcast(intent); + BaseTask.createIntent(task.getContext(), BlockerTask.class, id.phoneAccountHandle); + intent.putExtra(BlockerTask.EXTRA_TASK_ID, id.id); + intent.putExtra(BlockerTask.EXTRA_BLOCK_FOR_MILLIS, blockForMillis); + task.getContext().sendBroadcast(intent); } } diff --git a/java/com/android/voicemail/impl/scheduling/PostponePolicy.java b/java/com/android/voicemail/impl/scheduling/PostponePolicy.java index 46773b53a..8ff1478e3 100644 --- a/java/com/android/voicemail/impl/scheduling/PostponePolicy.java +++ b/java/com/android/voicemail/impl/scheduling/PostponePolicy.java @@ -29,17 +29,17 @@ public class PostponePolicy implements Policy { private static final String TAG = "PostponePolicy"; - private final int mPostponeMillis; - private BaseTask mTask; + private final int postponeMillis; + private BaseTask task; public PostponePolicy(int postponeMillis) { - mPostponeMillis = postponeMillis; + this.postponeMillis = postponeMillis; } @Override public void onCreate(BaseTask task, Bundle extras) { - mTask = task; - mTask.setExecutionTime(mTask.getTimeMillis() + mPostponeMillis); + this.task = task; + this.task.setExecutionTime(this.task.getTimeMillis() + postponeMillis); } @Override @@ -59,10 +59,10 @@ public class PostponePolicy implements Policy { @Override public void onDuplicatedTaskAdded() { - if (mTask.hasStarted()) { + if (task.hasStarted()) { return; } - VvmLog.i(TAG, "postponing " + mTask); - mTask.setExecutionTime(mTask.getTimeMillis() + mPostponeMillis); + VvmLog.i(TAG, "postponing " + task); + task.setExecutionTime(task.getTimeMillis() + postponeMillis); } } diff --git a/java/com/android/voicemail/impl/scheduling/RetryPolicy.java b/java/com/android/voicemail/impl/scheduling/RetryPolicy.java index c408bdc4a..ec4d72de9 100644 --- a/java/com/android/voicemail/impl/scheduling/RetryPolicy.java +++ b/java/com/android/voicemail/impl/scheduling/RetryPolicy.java @@ -32,23 +32,23 @@ public class RetryPolicy implements Policy { private static final String TAG = "RetryPolicy"; private static final String EXTRA_RETRY_COUNT = "extra_retry_count"; - private final int mRetryLimit; - private final int mRetryDelayMillis; + private final int retryLimit; + private final int retryDelayMillis; - private BaseTask mTask; + private BaseTask task; - private int mRetryCount; - private boolean mFailed; + private int retryCount; + private boolean failed; - private VoicemailStatus.DeferredEditor mVoicemailStatusEditor; + private VoicemailStatus.DeferredEditor voicemailStatusEditor; public RetryPolicy(int retryLimit, int retryDelayMillis) { - mRetryLimit = retryLimit; - mRetryDelayMillis = retryDelayMillis; + this.retryLimit = retryLimit; + this.retryDelayMillis = retryDelayMillis; } private boolean hasMoreRetries() { - return mRetryCount < mRetryLimit; + return retryCount < retryLimit; } /** @@ -57,18 +57,23 @@ public class RetryPolicy implements Policy { * the task is successful or there are no retries left. */ public VoicemailStatus.Editor getVoicemailStatusEditor() { - return mVoicemailStatusEditor; + return voicemailStatusEditor; } @Override public void onCreate(BaseTask task, Bundle extras) { - mTask = task; - mRetryCount = extras.getInt(EXTRA_RETRY_COUNT, 0); - if (mRetryCount > 0) { + this.task = task; + retryCount = extras.getInt(EXTRA_RETRY_COUNT, 0); + if (retryCount > 0) { VvmLog.i( TAG, - "retry #" + mRetryCount + " for " + mTask + " queued, executing in " + mRetryDelayMillis); - mTask.setExecutionTime(mTask.getTimeMillis() + mRetryDelayMillis); + "retry #" + + retryCount + + " for " + + this.task + + " queued, executing in " + + retryDelayMillis); + this.task.setExecutionTime(this.task.getTimeMillis() + retryDelayMillis); } PhoneAccountHandle phoneAccountHandle = task.getPhoneAccountHandle(); if (phoneAccountHandle == null) { @@ -76,7 +81,7 @@ public class RetryPolicy implements Policy { // This should never happen, but continue on if it does. The status write will be // discarded. } - mVoicemailStatusEditor = VoicemailStatus.deferredEdit(task.getContext(), phoneAccountHandle); + voicemailStatusEditor = VoicemailStatus.deferredEdit(task.getContext(), phoneAccountHandle); } @Override @@ -84,27 +89,27 @@ public class RetryPolicy implements Policy { @Override public void onCompleted() { - if (!mFailed || !hasMoreRetries()) { - if (!mFailed) { - VvmLog.i(TAG, mTask + " completed successfully"); + if (!failed || !hasMoreRetries()) { + if (!failed) { + VvmLog.i(TAG, task + " completed successfully"); } if (!hasMoreRetries()) { - VvmLog.i(TAG, "Retry limit for " + mTask + " reached"); + VvmLog.i(TAG, "Retry limit for " + task + " reached"); } - VvmLog.i(TAG, "committing deferred status: " + mVoicemailStatusEditor.getValues()); - mVoicemailStatusEditor.deferredApply(); + VvmLog.i(TAG, "committing deferred status: " + voicemailStatusEditor.getValues()); + voicemailStatusEditor.deferredApply(); return; } - VvmLog.i(TAG, "discarding deferred status: " + mVoicemailStatusEditor.getValues()); - Intent intent = mTask.createRestartIntent(); - intent.putExtra(EXTRA_RETRY_COUNT, mRetryCount + 1); + VvmLog.i(TAG, "discarding deferred status: " + voicemailStatusEditor.getValues()); + Intent intent = task.createRestartIntent(); + intent.putExtra(EXTRA_RETRY_COUNT, retryCount + 1); - mTask.getContext().sendBroadcast(intent); + task.getContext().sendBroadcast(intent); } @Override public void onFail() { - mFailed = true; + failed = true; } @Override |