diff options
author | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-02 22:32:30 +0100 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-05 19:22:46 +0100 |
commit | c6497708df40060c0e95a10f81d2709102a50f54 (patch) | |
tree | 3ffa9a82cbfc4901d585ed91593bd1610df454bd | |
parent | 8c6c5214ae850ab08827d848c5e072cfa7591cad (diff) | |
download | android_packages_apps_Snap-c6497708df40060c0e95a10f81d2709102a50f54.tar.gz android_packages_apps_Snap-c6497708df40060c0e95a10f81d2709102a50f54.tar.bz2 android_packages_apps_Snap-c6497708df40060c0e95a10f81d2709102a50f54.zip |
init SDCard, fix nullptr
Change-Id: I250664867c54a880bad63275b3c0300d8733c5af
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
1 files changed, 5 insertions, 0 deletions
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(); |