summaryrefslogtreecommitdiffstats
path: root/java/com/android/voicemail
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2017-09-27 10:13:49 -0700
committerEric Erfanian <erfanian@google.com>2017-09-28 08:33:56 -0700
commite37d60c2e304c599118a59e15ba4991f41cee785 (patch)
treeb1540b7210b312f8f47e31a2398130fd8850685e /java/com/android/voicemail
parentc3c6126757e3b185587909e6ac9c7c6e897df4f9 (diff)
downloadandroid_packages_apps_Dialer-e37d60c2e304c599118a59e15ba4991f41cee785.tar.gz
android_packages_apps_Dialer-e37d60c2e304c599118a59e15ba4991f41cee785.tar.bz2
android_packages_apps_Dialer-e37d60c2e304c599118a59e15ba4991f41cee785.zip
Refactor DialerStrictMode into an interface.
-bypassed violations are no longer logged in AospDialer The default implementation will use system strict mode and crash on bugfood build same as before. Bug: 66003745 Test: manual PiperOrigin-RevId: 170214128 Change-Id: Iab630f19499e90b15eb0b7f0707b4a70c7d81fbe
Diffstat (limited to 'java/com/android/voicemail')
-rw-r--r--java/com/android/voicemail/impl/VoicemailStatus.java4
-rw-r--r--java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java4
-rw-r--r--java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java4
3 files changed, 6 insertions, 6 deletions
diff --git a/java/com/android/voicemail/impl/VoicemailStatus.java b/java/com/android/voicemail/impl/VoicemailStatus.java
index 5553cf5e0..a24bad4c4 100644
--- a/java/com/android/voicemail/impl/VoicemailStatus.java
+++ b/java/com/android/voicemail/impl/VoicemailStatus.java
@@ -24,7 +24,7 @@ import android.provider.VoicemailContract;
import android.provider.VoicemailContract.Status;
import android.support.annotation.Nullable;
import android.telecom.PhoneAccountHandle;
-import com.android.dialer.strictmode.DialerStrictMode;
+import com.android.dialer.strictmode.StrictModeUtils;
public class VoicemailStatus {
@@ -100,7 +100,7 @@ public class VoicemailStatus {
ContentResolver contentResolver = mContext.getContentResolver();
Uri statusUri = VoicemailContract.Status.buildSourceUri(mContext.getPackageName());
try {
- DialerStrictMode.bypass(() -> contentResolver.insert(statusUri, mValues));
+ StrictModeUtils.bypass(() -> contentResolver.insert(statusUri, mValues));
} catch (IllegalArgumentException iae) {
VvmLog.e(TAG, "apply :: failed to insert content resolver ", iae);
mValues.clear();
diff --git a/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java b/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java
index caf33df13..d05940a57 100644
--- a/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java
+++ b/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java
@@ -35,7 +35,7 @@ import android.telecom.TelecomManager;
import android.text.TextUtils;
import com.android.dialer.common.Assert;
import com.android.dialer.common.concurrent.ThreadUtil;
-import com.android.dialer.strictmode.DialerStrictMode;
+import com.android.dialer.strictmode.StrictModeUtils;
import com.android.voicemail.VoicemailComponent;
/**
@@ -128,7 +128,7 @@ public class ConfigOverrideFragment extends PreferenceFragment
}
public static boolean isOverridden(Context context) {
- return DialerStrictMode.bypass(
+ return StrictModeUtils.bypass(
() ->
PreferenceManager.getDefaultSharedPreferences(context)
.getBoolean(context.getString(R.string.vvm_config_override_enabled_key), false));
diff --git a/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java b/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java
index baf58041f..0e3f27cd8 100644
--- a/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java
+++ b/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java
@@ -30,7 +30,7 @@ import android.os.Parcelable;
import android.preference.PreferenceManager;
import android.support.annotation.MainThread;
import com.android.dialer.constants.ScheduledJobIds;
-import com.android.dialer.strictmode.DialerStrictMode;
+import com.android.dialer.strictmode.StrictModeUtils;
import com.android.voicemail.impl.Assert;
import com.android.voicemail.impl.VvmLog;
import java.util.ArrayList;
@@ -59,7 +59,7 @@ public class TaskSchedulerJobService extends JobService implements TaskExecutor.
public boolean onStartJob(JobParameters params) {
int jobId = params.getTransientExtras().getInt(EXTRA_JOB_ID);
int expectedJobId =
- DialerStrictMode.bypass(
+ StrictModeUtils.bypass(
() -> PreferenceManager.getDefaultSharedPreferences(this).getInt(EXPECTED_JOB_ID, 0));
if (jobId != expectedJobId) {
VvmLog.e(