diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-30 05:11:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-30 05:11:53 +0000 |
commit | a6b96247b1348dd6316fb0b5355c980883765530 (patch) | |
tree | 9328cb3c85134aeb3837d6a3126d56d93a6a9cbe /java/com/android/voicemail | |
parent | f27f1bd028abfcac714cf5aed6bbbab8d21077a6 (diff) | |
parent | 9f16e171d04fbafe042d83b6bfaf5309f886f0e1 (diff) |
Merge changes I29d00f22,I9337e226
* changes:
Added a hack for NUI because of a dependency cycle.
Use application context when fetching shared prefs.
Diffstat (limited to 'java/com/android/voicemail')
-rw-r--r-- | java/com/android/voicemail/impl/OmtpService.java | 4 | ||||
-rw-r--r-- | java/com/android/voicemail/impl/VisualVoicemailPreferences.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/voicemail/impl/OmtpService.java b/java/com/android/voicemail/impl/OmtpService.java index 4e8860c02..e10a27571 100644 --- a/java/com/android/voicemail/impl/OmtpService.java +++ b/java/com/android/voicemail/impl/OmtpService.java @@ -197,14 +197,14 @@ public class OmtpService extends VisualVoicemailService { } private static void setShuttingDown(Context context, boolean value) { - PreferenceManager.getDefaultSharedPreferences(context) + PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext()) .edit() .putBoolean(IS_SHUTTING_DOWN, value) .apply(); } private static boolean isShuttingDown(Context context) { - return PreferenceManager.getDefaultSharedPreferences(context) + return PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext()) .getBoolean(IS_SHUTTING_DOWN, false); } } diff --git a/java/com/android/voicemail/impl/VisualVoicemailPreferences.java b/java/com/android/voicemail/impl/VisualVoicemailPreferences.java index 72506eb93..1d7204e94 100644 --- a/java/com/android/voicemail/impl/VisualVoicemailPreferences.java +++ b/java/com/android/voicemail/impl/VisualVoicemailPreferences.java @@ -31,7 +31,7 @@ public class VisualVoicemailPreferences extends PerAccountSharedPreferences { super( context, phoneAccountHandle, - PreferenceManager.getDefaultSharedPreferences(context), + PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext()), "visual_voicemail_"); } } |