summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2016-01-11 17:40:58 +0100
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:22:28 -0700
commitdaea7de004eec7982b3f4021f4fb109836f7f2da (patch)
treea8b5d2ec5db5e1844152b48e368764a39ebc36da /src/com
parenta5cf7b4a9731d0ce87922d706d8b81d136c0ec17 (diff)
downloadandroid_packages_apps_Snap-daea7de004eec7982b3f4021f4fb109836f7f2da.tar.gz
android_packages_apps_Snap-daea7de004eec7982b3f4021f4fb109836f7f2da.tar.bz2
android_packages_apps_Snap-daea7de004eec7982b3f4021f4fb109836f7f2da.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/com')
-rwxr-xr-xsrc/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 d43d8d31f..4ec0a47c4 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -567,6 +567,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.
@@ -904,8 +905,6 @@ public class PhotoModule
return;
}
- mApplicationContext = CameraApp.getContext();
-
// Initialize location service.
boolean recordLocation = RecordLocationPreference.get(mPreferences);
mLocationManager.recordLocation(recordLocation);