Merge changes I29d00f22,I9337e226

* changes:
  Added a hack for NUI because of a dependency cycle.
  Use application context when fetching shared prefs.

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_");
   }
 }