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/callcomposer | |
| 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/callcomposer')
| -rw-r--r-- | java/com/android/dialer/callcomposer/CallComposerActivity.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java index bad5d7f54..eedf0735c 100644 --- a/java/com/android/dialer/callcomposer/CallComposerActivity.java +++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java @@ -73,8 +73,8 @@ import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.multimedia.MultimediaData; import com.android.dialer.protos.ProtoParsers; +import com.android.dialer.storage.StorageComponent; import com.android.dialer.telecom.TelecomUtil; -import com.android.dialer.util.DialerUtils; import com.android.dialer.util.UriUtils; import com.android.dialer.util.ViewUtil; import com.android.dialer.widget.DialerToolbar; @@ -459,8 +459,7 @@ public class CallComposerActivity extends AppCompatActivity } private void maybeShowPrivacyToast(MultimediaData data) { - SharedPreferences preferences = - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(this); + SharedPreferences preferences = StorageComponent.get(this).unencryptedSharedPrefs(); // Show a toast for privacy purposes if this is the first time a user uses call composer. if (preferences.getBoolean(KEY_IS_FIRST_CALL_COMPOSE, true)) { int privacyMessage = |