From e37d60c2e304c599118a59e15ba4991f41cee785 Mon Sep 17 00:00:00 2001 From: wangqi Date: Wed, 27 Sep 2017 10:13:49 -0700 Subject: 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 --- .../android/contacts/common/preference/ContactsPreferences.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/com/android/contacts/common') diff --git a/java/com/android/contacts/common/preference/ContactsPreferences.java b/java/com/android/contacts/common/preference/ContactsPreferences.java index 399700e28..d0adb0421 100644 --- a/java/com/android/contacts/common/preference/ContactsPreferences.java +++ b/java/com/android/contacts/common/preference/ContactsPreferences.java @@ -27,7 +27,7 @@ import android.provider.Settings.SettingNotFoundException; import android.text.TextUtils; import com.android.contacts.common.R; import com.android.contacts.common.model.account.AccountWithDataSet; -import com.android.dialer.strictmode.DialerStrictMode; +import com.android.dialer.strictmode.StrictModeUtils; /** Manages user preferences for contacts. */ public class ContactsPreferences implements OnSharedPreferenceChangeListener { @@ -107,7 +107,7 @@ public class ContactsPreferences implements OnSharedPreferenceChangeListener { mSortOrder = sortOrder; final Editor editor = mPreferences.edit(); editor.putInt(SORT_ORDER_KEY, sortOrder); - DialerStrictMode.bypass(editor::commit); + StrictModeUtils.bypass(editor::commit); } private boolean isDisplayOrderUserChangeable() { @@ -136,7 +136,7 @@ public class ContactsPreferences implements OnSharedPreferenceChangeListener { mDisplayOrder = displayOrder; final Editor editor = mPreferences.edit(); editor.putInt(DISPLAY_ORDER_KEY, displayOrder); - DialerStrictMode.bypass(editor::commit); + StrictModeUtils.bypass(editor::commit); } private boolean isDefaultAccountUserChangeable() { @@ -166,7 +166,7 @@ public class ContactsPreferences implements OnSharedPreferenceChangeListener { editor.putString(mDefaultAccountKey, accountWithDataSet.stringify()); } editor.putBoolean(mDefaultAccountSavedKey, true); - DialerStrictMode.bypass(editor::commit); + StrictModeUtils.bypass(editor::commit); } public void registerChangeListener(ChangeListener listener) { -- cgit v1.2.3