summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2016-01-11 17:40:58 +0100
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:02:50 +0100
commit628929bae6930ae3b8ec3b4dbfc5c3479bac903b (patch)
tree2e160db2d8355b4a7669887eda1d6cc272cd1acc /src
parent426d66bca931a0e09d5f645b99fe546de843b4cb (diff)
downloadandroid_packages_apps_Snap-628929bae6930ae3b8ec3b4dbfc5c3479bac903b.tar.gz
android_packages_apps_Snap-628929bae6930ae3b8ec3b4dbfc5c3479bac903b.tar.bz2
android_packages_apps_Snap-628929bae6930ae3b8ec3b4dbfc5c3479bac903b.zip
Move mApplicationContext to init()
Fixes following NPE: 01-11 17:36:42.607 4329 4391 E AndroidRuntime: FATAL EXCEPTION: Thread-235 01-11 17:36:42.607 4329 4391 E AndroidRuntime: Process: org.cyanogenmod.snap, PID: 4329 01-11 17:36:42.607 4329 4391 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'android.content.res.Resources android.content.Context.getResources()' on a null object reference 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.updateCameraParametersPreference(PhotoModule.java:3492) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.setCameraParameters(PhotoModule.java:3714) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.startPreview(PhotoModule.java:2715) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule.-wrap14(PhotoModule.java) 01-11 17:36:42.607 4329 4391 E AndroidRuntime: at com.android.camera.PhotoModule$OpenCameraThread.run(PhotoModule.java:265) Change-Id: I6ca0dfe402cab46dd7b6f102921062f3c7ec8d43
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index ae5532d1d..fa5cbbe39 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -593,6 +593,7 @@ public class PhotoModule
mCameraId = getPreferredCameraId(mPreferences);
mContentResolver = mActivity.getContentResolver();
+ mApplicationContext = CameraApp.getContext();
// Surface texture is from camera screen nail and startPreview needs it.
// This must be done before startPreview.
@@ -934,8 +935,6 @@ public class PhotoModule
return;
}
- mApplicationContext = CameraApp.getContext();
-
// Initialize location service.
boolean recordLocation = RecordLocationPreference.get(mPreferences,
CameraSettings.KEY_RECORD_LOCATION);