diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-27 17:21:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-27 17:21:27 +0000 |
| commit | 4499718cc171a6c79e03fc53e139efaf4d8ba6f8 (patch) | |
| tree | c830e73232470fc7498ffe3853c0428274e2194f /java/com/android/dialer/app | |
| parent | f60c5384f34660ae03ae3c15183980dfb8219ba9 (diff) | |
| parent | 5d8ed9309625302dee3407b320a52f2b7f30227f (diff) | |
Merge changes I6e17c1cc,If00f7e91,Ia89d5d85
* changes:
Fix HOLD option not displayed in voice calls in CDMA + GSM.
Use string concatenation for CREATE_TABLE_SQL instead of StringBuilder()
Move the functionality of DialerUtils#getDefaultSharedPreferenceForDeviceProtectedStorageContext(Context) to StorageComponent.
Diffstat (limited to 'java/com/android/dialer/app')
| -rw-r--r-- | java/com/android/dialer/app/DialtactsActivity.java | 7 | ||||
| -rw-r--r-- | java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index b5ec20246..1dd852487 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -129,6 +129,7 @@ import com.android.dialer.simulator.Simulator; import com.android.dialer.simulator.SimulatorComponent; import com.android.dialer.smartdial.SmartDialNameMatcher; import com.android.dialer.smartdial.SmartDialPrefix; +import com.android.dialer.storage.StorageComponent; import com.android.dialer.telecom.TelecomUtil; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.PermissionsUtil; @@ -637,7 +638,8 @@ public class DialtactsActivity extends TransactionSafeActivity && !getSystemService(KeyguardManager.class).isKeyguardLocked()) { mListsFragment.markMissedCallsAsReadAndRemoveNotifications(); } - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(this) + StorageComponent.get(this) + .unencryptedSharedPrefs() .edit() .putInt(KEY_LAST_TAB, mListsFragment.getCurrentTabIndex()) .apply(); @@ -1117,7 +1119,8 @@ public class DialtactsActivity extends TransactionSafeActivity } else if (isLastTabEnabled) { @TabIndex int tabIndex = - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(this) + StorageComponent.get(this) + .unencryptedSharedPrefs() .getInt(KEY_LAST_TAB, DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL); // If voicemail tab is saved and its availability changes, we still move to the voicemail tab // but it is quickly removed and shown the contacts tab. diff --git a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java index 0a6f2c156..3ce837b8c 100644 --- a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java +++ b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java @@ -33,7 +33,7 @@ import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.common.PerAccountSharedPreferences; import com.android.dialer.compat.telephony.TelephonyManagerCompat; -import com.android.dialer.util.DialerUtils; +import com.android.dialer.storage.StorageComponent; import com.android.voicemail.VoicemailClient; import com.android.voicemail.VoicemailComponent; @@ -140,8 +140,6 @@ public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver { static PerAccountSharedPreferences getSharedPreferences( Context context, PhoneAccountHandle phoneAccountHandle) { return new PerAccountSharedPreferences( - context, - phoneAccountHandle, - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)); + context, phoneAccountHandle, StorageComponent.get(context).unencryptedSharedPrefs()); } } |