1 files changed, 8 insertions, 10 deletions
diff --git a/common/src/com/android/tv/common/BaseApplication.java b/common/src/com/android/tv/common/BaseApplication.java
index 1a421209..45c32567 100644
--- a/common/src/com/android/tv/common/BaseApplication.java
+++ b/common/src/com/android/tv/common/BaseApplication.java
@@ -21,22 +21,17 @@ import android.content.Context;
 import android.os.Build;
 import android.os.StrictMode;
 import android.support.annotation.VisibleForTesting;
-
-import com.android.tv.common.dev.DeveloperPreferences;
 import com.android.tv.common.feature.CommonFeatures;
 import com.android.tv.common.recording.RecordingStorageStatusManager;
 import com.android.tv.common.util.Clock;
 import com.android.tv.common.util.CommonUtils;
 import com.android.tv.common.util.Debug;
-
-import dagger.Lazy;
+import com.android.tv.common.util.SystemProperties;
 import dagger.android.DaggerApplication;
 
-import javax.inject.Inject;
-
-/** The base application class for TV applications. */
+/** The base application class for Live TV applications. */
 public abstract class BaseApplication extends DaggerApplication implements BaseSingletons {
-    @Inject Lazy<RecordingStorageStatusManager> mRecordingStorageStatusManager;
+    private RecordingStorageStatusManager mRecordingStorageStatusManager;
 
     /**
      * An instance of {@link BaseSingletons}. Note that this can be set directly only for the test
@@ -70,7 +65,7 @@ public abstract class BaseApplication extends DaggerApplication implements BaseS
 
         // Only set StrictMode for ENG builds because the build server only produces userdebug
         // builds.
-        if (BuildConfig.ENG && DeveloperPreferences.ALLOW_STRICT_MODE.get(this)) {
+        if (BuildConfig.ENG && SystemProperties.ALLOW_STRICT_MODE.getValue()) {
             StrictMode.ThreadPolicy.Builder threadPolicyBuilder =
                     new StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog();
             // TODO(b/69565157): Turn penaltyDeath on for VMPolicy when tests are fixed.
@@ -104,6 +99,9 @@ public abstract class BaseApplication extends DaggerApplication implements BaseS
     @Override
     @TargetApi(Build.VERSION_CODES.N)
     public RecordingStorageStatusManager getRecordingStorageStatusManager() {
-        return mRecordingStorageStatusManager.get();
+        if (mRecordingStorageStatusManager == null) {
+            mRecordingStorageStatusManager = new RecordingStorageStatusManager(this);
+        }
+        return mRecordingStorageStatusManager;
     }
 }