From c6497708df40060c0e95a10f81d2709102a50f54 Mon Sep 17 00:00:00 2001
From: codeworkx <codeworkx@cyanogenmod.org>
Date: Sat, 2 Jan 2016 22:32:30 +0100
Subject: init SDCard, fix nullptr

Change-Id: I250664867c54a880bad63275b3c0300d8733c5af
---
 src/com/android/camera/CameraActivity.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/com/android')

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 0553979d1..1ba6022f5 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -117,6 +117,7 @@ import java.io.File;
 import java.io.IOException;
 
 import static com.android.camera.CameraManager.CameraOpenErrorCallback;
+import com.android.camera.SDCard;
 
 import android.media.AudioManager;
 
@@ -249,6 +250,7 @@ public class CameraActivity extends Activity
     private int mShutterVol;
     private int mOriginalMasterVol;
     private WakeLock mWakeLock;
+    private Context mContext;
 
     private class MyOrientationEventListener
             extends OrientationEventListener {
@@ -1407,6 +1409,9 @@ public class CameraActivity extends Activity
         }
         GcamHelper.init(getContentResolver());
 
+        mContext = getApplicationContext();
+        SDCard.initialize(mContext);
+
 /*
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         mOriginalMasterVol = mAudioManager.getMasterVolume();
-- 
cgit v1.2.3